| commit | 18a8124f582e9d763670e3bcc6ef6b2b00c4d394 | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Thu Aug 20 19:53:55 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 20 19:53:55 2015 +0000 |
| tree | 62abbda0ae5ac64359add878f6adfbd59098b55e | |
| parent | 0dbd0d7bfe340ac46271c7f87969431b62a023ed [diff] | |
| parent | da0a48d2704b231f13dbdb28cc4c4d12b08e3faf [diff] |
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 'da0a48d2704b231f13dbdb28cc4c4d12b08e3faf': DO NOT MERGE Fail more gracefully on allocation failure