tree c50e86e609b03c68e92c6abdc770cd6a82de1be4
parent 4955bfb4caeb9b0b03b85a1e886674ddbccdb44f
parent 2e941e40ce76eb13b273479a4ee8fb6e40d33795
author Marco Nelissen <marcone@google.com> 1431012801 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1431012801 +0000

am 2e941e40: Fix allocation failure crash

* commit '2e941e40ce76eb13b273479a4ee8fb6e40d33795':
  Fix allocation failure crash