| commit | 008807813e8fd703f89bf84c8f2c725bb19a434f | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Thu Aug 20 20:39:14 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 20 20:39:14 2015 +0000 |
| tree | 61fff244959003be547572314622184b4ae0141a | |
| parent | d4f0d88e701f5323621bd352cf4cbcd14bc349c4 [diff] | |
| parent | f839b2a33c46f3520684f0a839760cca36a6b4c7 [diff] |
am f839b2a3: (-s ours) am 5aa887ef: am 59bfb7aa: (-s ours) 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 'f839b2a33c46f3520684f0a839760cca36a6b4c7': DO NOT MERGE Fail more gracefully on allocation failure