tree f654bf5c54a068d69402c485e7d59c6a4d6fbcf0
parent 2913ce4141be93962ed488495ff3cbcdb74f7cb7
parent 2f14418c3176caa09d646d95e5556c11e3b86549
author Keisuke Kuroyanagi <ksk@google.com> 1380691324 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1380691324 -0700

am 2f14418c: am e628cd3c: (-s ours) Use reentrant lock for main dictionaries. DO NOT MERGE

* commit '2f14418c3176caa09d646d95e5556c11e3b86549':