tree 3df13b324209e6ab022e8508522255c975507533
parent 152f8c41d053c7c678618798bd79922424a08fac
parent c53163a4a396efb0b18ff5d4e16a53b8c5c2f807
author Brad Fitzpatrick <bradfitz@android.com> 1300213796 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1300213796 -0700

am b37f7e59: Merge changes I81fc2f90,I5e7fd759

* commit 'b37f7e59ee38472bdd3ca5fe66cc847890c862e2':
  Using proper key for removing from map.
  Removing wrong equals method in comparator.