tree 31388f8e8245ac3574d20b09bb905e9d896109f7
parent c332bb47ae267a413f1e3bed5c0e9b95368173aa
parent bd68d901bec2cb497d27ee0502ab9b4cee1fab7a
author Ficus Kirkpatrick <ficus@android.com> 1425773259 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1425773259 +0000

am bd68d901: am 79d00f42: Merge "fix ImageLoader.getCacheKey()"

* commit 'bd68d901bec2cb497d27ee0502ab9b4cee1fab7a':
  fix ImageLoader.getCacheKey()