tree 31388f8e8245ac3574d20b09bb905e9d896109f7
parent bd674b13fbf958fe2f918c364a73222db2e338f9
parent cb913d5293f4281e836c51bfe9956dbed8f2cabf
author Ficus Kirkpatrick <ficus@android.com> 1425773802 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1425773802 +0000

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

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