tree 7a2fa8ee998e8d01518e93e19ba9090cd438df51
parent c99244105803ac32f4cc698b5b2a85b225d925a2
parent 6020f06633f8cac09f47e561cc389c5b9b152464
author Marco Nelissen <marcone@google.com> 1440100001 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440100001 +0000

am 6020f066: am b294a97a: am 6cba5819: am 51bfaf6c: am 1afea551: am ce73af07: DO NOT MERGE Fail more gracefully on allocation failure

* commit '6020f06633f8cac09f47e561cc389c5b9b152464':
  DO NOT MERGE Fail more gracefully on allocation failure