OSDN Git Service

am d4f0d88e: resolved conflicts for merge of eb10ccbc to lmp-dev
authorMarco Nelissen <marcone@google.com>
Thu, 20 Aug 2015 19:01:36 +0000 (19:01 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 20 Aug 2015 19:01:36 +0000 (19:01 +0000)
commita3cc32723905e35be68594843464f6fcceb7ee73
tree24d57259fbbf96ba8aae0ca3efe8b7c23f7331e8
parentb8a84e59ed3724a2e220dbda49dc5478334e9bad
parentd4f0d88e701f5323621bd352cf4cbcd14bc349c4
am d4f0d88e: resolved conflicts for merge of eb10ccbc to lmp-dev

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