tree fc18f03943e0ac3c90d2cf44070ebb0f65334447
parent 6ca45cdd92301d49e06572edf13edcbe9c5e94cc
parent cc9b5ca607b75be4beb9c94a628d43d0040acdfc
author Ficus Kirkpatrick <ficus@android.com> 1425859742 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1425859742 +0000

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

* commit 'cc9b5ca607b75be4beb9c94a628d43d0040acdfc':
  Fix broken DiskBasedCache