| commit | 7503844618a7a6fc02481d4d80e9848c66b38b02 | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Thu Aug 20 22:26:56 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 20 22:26:56 2015 +0000 |
| tree | 02759f20bff4fdf8e6f00b6ca73812b19b317cfa | |
| parent | af34348be61c28f29413eea0ff13fedf4a94e7f8 [diff] | |
| parent | 363a069f08b180a8008900d485ab4ae441756aac [diff] |
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 1afea551: am ce73 * commit '363a069f08b180a8008900d485ab4ae441756aac': DO NOT MERGE Fail more gracefully on allocation failure