tree a3d6cd62d8c2f9a066cccef0ecfbbdcfc54223b5
parent 158135f49f5372f24557d9d1e0917fd746acf6f2
parent 51ccfdb54990e2c30bc3057e8f18ee760c7eee41
author Joshua Bloch <jjb@google.com> 1253629810 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1253629810 -0700

am 51ccfdb5: Merge change 26318 into eclair

Merge commit '51ccfdb54990e2c30bc3057e8f18ee760c7eee41' into eclair-plus-aosp

* commit '51ccfdb54990e2c30bc3057e8f18ee760c7eee41':
  Fixed LinkedHashMap bug 2121546