tree fc18f03943e0ac3c90d2cf44070ebb0f65334447
parent cb913d5293f4281e836c51bfe9956dbed8f2cabf
parent 815797fab585958b6031093fe03ff281f953f2fa
author Ficus Kirkpatrick <ficus@android.com> 1425859337 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1425859337 +0000

am 815797fa: am dbc6d33e: Merge "Fix broken DiskBasedCache"

* commit '815797fab585958b6031093fe03ff281f953f2fa':
  Fix broken DiskBasedCache