| commit | 363a069f08b180a8008900d485ab4ae441756aac | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Thu Aug 20 22:06:08 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 20 22:06:08 2015 +0000 |
| tree | 903b0a6e352c23f5cc02cbd9c10ee55b0457380c | |
| parent | e1a78e8ee94b4d344d3d04c8f66f8f860c779b30 [diff] | |
| parent | 588d7b8dc4c000f1a9a4510e9510cb3b2810404c [diff] |
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 ce73af07: DO NOT * commit '588d7b8dc4c000f1a9a4510e9510cb3b2810404c': DO NOT MERGE Fail more gracefully on allocation failure