| commit | 7fce7a3952e5932a1babea69616809ce34cf5285 | [log] [tgz] |
|---|---|---|
| author | Jeff Hao <jeffhao@google.com> | Sat Sep 19 20:00:15 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Sep 19 20:00:15 2015 +0000 |
| tree | 8cd135a881f8452b17c7b339436b47d17e8b8f6b | |
| parent | 4d5b0345eb0f5f340050799575e07eb24c9267b7 [diff] | |
| parent | 6f1460b433d47f42fa62802ab549dc5acebafb13 [diff] |
am 6f1460b4: am 9e30c0e1: Merge "Fix locking on string init map." * commit '6f1460b433d47f42fa62802ab549dc5acebafb13': Fix locking on string init map.