Commit 3a745883 authored Mar 15, 2011 by Brad Fitzpatrick Committed by Android Git Automerger Mar 15, 2011

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

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

There are no changes