tree bbda182d07f5b362b29cfb65f300d711cfc92e55
parent 02923c49ecccaed93eae98f80beaf255f415e245
parent 68fcda9a884cefe7530d2306bc39ce185ebd1660
author Marco Nelissen <marcone@google.com> 1431019024 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1431019024 +0000

am 68fcda9a: am 4c80f99c: am 2e941e40: Fix allocation failure crash

* commit '68fcda9a884cefe7530d2306bc39ce185ebd1660':
  Fix allocation failure crash