| commit | 1b705ed747a56fbab37b169b67eb440621607a38 | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Thu Aug 20 22:31:19 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 20 22:31:19 2015 +0000 |
| tree | 0b38a882fe3a68421f65fddd3fa2a979a449a5ff | |
| parent | 9a57d1cb51ef14a666eefb32b245dd47cf79844e [diff] | |
| parent | 7503844618a7a6fc02481d4d80e9848c66b38b02 [diff] |
am 75038446: am 363a069f: am 588d7b8d: am 1c12b44c: (-s ours) am e9b4f50e: am 386c576a: 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 1afe * commit '7503844618a7a6fc02481d4d80e9848c66b38b02': DO NOT MERGE Fail more gracefully on allocation failure