tree 53d8ddb649abf197edfe2b42e09b757a15ee54e1
parent 9cd3b1218e8789aed5e8c746568e43ff4e5481b5
parent 4899398dcad50d1b9734ca5f8959712f42f72b02
author Chris Craik <ccraik@google.com> 1383780822 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1383780822 -0800

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

* commit '4899398dcad50d1b9734ca5f8959712f42f72b02':
  Fix NPE with inPurgeable Bitmaps in getAllocationByteCount