tree 32aeba02906ee7fbf9f1616fec951c28626afb90
parent a7bcbbaf4cef0bb35cf3f939102b159eeeaaec66
parent c703df8116e92a98f33f6baf4eb4c7bf78584fd1
author Elliott Hughes <enh@google.com> 1362161154 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1362161154 +0000

am c703df81: am ff66631f: Merge "Fix the HashMap performance regression."

* commit 'c703df8116e92a98f33f6baf4eb4c7bf78584fd1':
  Fix the HashMap performance regression.