am 6f31b8c0: am 102930a0: Merge "Remove deprecated and unused entryEvicted method." into honeycomb-mr1

* commit '6f31b8c058964ffd87da9f08fc02727bd9415e0b':
  Remove deprecated and unused entryEvicted method.