tree 3e299d3185d46ab0261dc2a0f92438213d428a1f
parent 7a4cfed77b138db03bc79fc6ef2be83db7d1831b
parent 32fe08156c361a0943b99348ecba5fdbe8dc8985
author Marco Nelissen <marcone@google.com> 1440099533 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440099533 +0000

am 32fe0815: am c663f602: am c03cf67e: am a3cc3272: am d4f0d88e: resolved conflicts for merge of eb10ccbc to lmp-dev

* commit '32fe08156c361a0943b99348ecba5fdbe8dc8985':
  Fail more gracefully on allocation failure