tree 24d57259fbbf96ba8aae0ca3efe8b7c23f7331e8
parent b8a84e59ed3724a2e220dbda49dc5478334e9bad
parent d4f0d88e701f5323621bd352cf4cbcd14bc349c4
author Marco Nelissen <marcone@google.com> 1440097296 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440097296 +0000

am d4f0d88e: resolved conflicts for merge of eb10ccbc to lmp-dev

* commit 'd4f0d88e701f5323621bd352cf4cbcd14bc349c4':
  Fail more gracefully on allocation failure