am c73c4a36: (-s ours) am b37f7e59: Merge changes I81fc2f90,I5e7fd759

* commit 'c73c4a36d2cf5eb3eeeca97caca25c3920dbcfa0':
  Using proper key for removing from map.
  Removing wrong equals method in comparator.
This commit is contained in:
Brad Fitzpatrick 2011-03-15 11:37:12 -07:00 committed by Android Git Automerger
commit 2cc788c9a6

Diff Content Not Available