tree fc18f03943e0ac3c90d2cf44070ebb0f65334447
parent bd68d901bec2cb497d27ee0502ab9b4cee1fab7a
parent dbc6d33edd721b6d7d8b40eedd26e3d0f54d0193
author Ficus Kirkpatrick <ficus@android.com> 1425859116 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1425859116 +0000

am dbc6d33e: Merge "Fix broken DiskBasedCache"

* commit 'dbc6d33edd721b6d7d8b40eedd26e3d0f54d0193':
  Fix broken DiskBasedCache