| commit | 1c12b44cab37c6287e5314668b8f5192f0501d68 | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Thu Aug 20 21:46:29 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 20 21:46:29 2015 +0000 |
| tree | 5cbb34759999698c9920a784dd62239081f239e9 | |
| parent | 32fe08156c361a0943b99348ecba5fdbe8dc8985 [diff] | |
| parent | e9b4f50e4abcdf606440c2fcd9083d094df4de27 [diff] |
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 MERGE Fail more gracefully on alloca * commit 'e9b4f50e4abcdf606440c2fcd9083d094df4de27': DO NOT MERGE Fail more gracefully on allocation failure