| commit | 386c576aae9a75b31abd3122cc62520087d3a339 | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Thu Aug 20 20:56:36 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 20 20:56:36 2015 +0000 |
| tree | 36cf2411b213d0fcb3c1e278d13e46a6a1aeff6c | |
| parent | c03cf67eb55cb1a228e5c915ac4eb8f113a5af54 [diff] | |
| parent | e534b0e898e4a97f392b4132c8c6a571f2bdcb6f [diff] |
am e534b0e8: am 00880781: 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 'e534b0e898e4a97f392b4132c8c6a571f2bdcb6f': DO NOT MERGE Fail more gracefully on allocation failure