tree b9a855d553490498fbd796cbbbac8bf4f217c89b
parent cd46ab6da83f24b28bdf59a9005acd985a6018da
parent 0e406003b5d434d8f16d7d6ad97d446060b788e6
author Ficus Kirkpatrick <ficus@android.com> 1403650009 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1403650009 +0000

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

* commit '0e406003b5d434d8f16d7d6ad97d446060b788e6':
  Fix crash/OOM in DiskBasedCache