tree a245be4d7e0a3ca646ff7f82d94bb6d287437adb
parent 4aef7e73e12297767f165c585fec6e4b574e67d1
parent ee92973e5d6dd7c5df57dd41fa3a482c076a79a8
author Jesse Wilson <jessewilson@google.com> 1254350026 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1254350026 -0700

am 910363bd: Merge change Ib5dc3f1f into eclair

Merge commit '910363bd8d50c2a5558a71e47377928265c1219e' into eclair-plus-aosp

* commit '910363bd8d50c2a5558a71e47377928265c1219e':
  Fixing a lame test that was relying on hashmap iteration order.