tree eb3ed2ea90bc58d5abd719ce1c4977b6020acd1a
parent 9aed2ae0bd03edcaef3dd3cac8795055cf8d2b43
parent 47742d4bb004a51c045d443024a36d784cd38d9b
author Chris Craik <ccraik@google.com> 1383780411 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1383780411 -0800

am 47742d4b: Merge "Fix NPE with inPurgeable Bitmaps in getAllocationByteCount" into klp-dev

* commit '47742d4bb004a51c045d443024a36d784cd38d9b':
  Fix NPE with inPurgeable Bitmaps in getAllocationByteCount