Commit 2cc788c9 authored Mar 15, 2011 by Brad Fitzpatrick Committed by Android Git Automerger Mar 15, 2011

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.

There are no changes