| commit | 6f1460b433d47f42fa62802ab549dc5acebafb13 | [log] [tgz] |
|---|---|---|
| author | Jeff Hao <jeffhao@google.com> | Sat Sep 19 19:52:38 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Sep 19 19:52:38 2015 +0000 |
| tree | 8cd135a881f8452b17c7b339436b47d17e8b8f6b | |
| parent | 5ca4da495123598fcc6cc0db249fa4a266bfe140 [diff] | |
| parent | 9e30c0e177adabaaf94a66c91130a19a7632fc7c [diff] |
am 9e30c0e1: Merge "Fix locking on string init map." * commit '9e30c0e177adabaaf94a66c91130a19a7632fc7c': Fix locking on string init map.