OSDN Git Service

am 18a8124f: am da0a48d2: (-s ours) am 6020f066: am b294a97a: am 6cba5819: am 51bfaf6...
authorMarco Nelissen <marcone@google.com>
Thu, 20 Aug 2015 20:11:03 +0000 (20:11 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 20 Aug 2015 20:11:03 +0000 (20:11 +0000)
commit59bfb7aa42ce2404da2547e7852e1a1215c6af22
treef761d21bfae5e0e042ee41ae0fb43fc149850f07
parent9d9491f9fb83523cfe68f2aa26c14f72f70812fc
parent18a8124f582e9d763670e3bcc6ef6b2b00c4d394
am 18a8124f: am da0a48d2: (-s ours) am 6020f066: am b294a97a: am 6cba5819: am 51bfaf6c: am 1afea551: am ce73af07: DO NOT MERGE Fail more gracefully on allocation failure

* commit '18a8124f582e9d763670e3bcc6ef6b2b00c4d394':
  DO NOT MERGE Fail more gracefully on allocation failure