tree 7b2b18dacacfdc884346e4c763a871a5fdfcf348
parent eafdc0ceab8589c108fe60add8c0377e4481d863
parent 6ccd708adf345337137a7ef8efa6fd618afa7bc4
author Ficus Kirkpatrick <ficus@android.com> 1403656130 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1403656130 +0000

am 6ccd708a: am 0e406003: Merge "Fix crash/OOM in DiskBasedCache"

* commit '6ccd708adf345337137a7ef8efa6fd618afa7bc4':
  Fix crash/OOM in DiskBasedCache