tree e3177c7686cb6203c5f4c91cb9a38b6e80fcbec0
parent 8e7b964be2fab9b6bbb30cf8897617424d0fe85f
parent 4686c52394c0221ee3236753ad6be48f18b79365
author Jeff Hao <jeffhao@google.com> 1442617102 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1442617102 +0000

Merge "Fix locking on string init map."