tree f654bf5c54a068d69402c485e7d59c6a4d6fbcf0
parent a0c9846fb99b65a6a4a578eba38f3d4b66056fed
parent e628cd3c325d97243d4ef1c991f07c084d0cbaac
author Keisuke Kuroyanagi <ksk@google.com> 1380589372 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1380589372 -0700

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

* commit 'e628cd3c325d97243d4ef1c991f07c084d0cbaac':
  Use reentrant lock for main dictionaries. DO NOT MERGE