diff options
| author | Marco Nelissen <marcone@google.com> | 2015-08-20 21:57:45 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-20 21:57:45 +0000 |
| commit | 588d7b8dc4c000f1a9a4510e9510cb3b2810404c (patch) | |
| tree | 3e299d3185d46ab0261dc2a0f92438213d428a1f | |
| parent | efbc1bc8e7e247a612966356c9063c6eca0b7188 (diff) | |
| parent | 1c12b44cab37c6287e5314668b8f5192f0501d68 (diff) | |
| download | frameworks_av-588d7b8dc4c000f1a9a4510e9510cb3b2810404c.zip frameworks_av-588d7b8dc4c000f1a9a4510e9510cb3b2810404c.tar.gz frameworks_av-588d7b8dc4c000f1a9a4510e9510cb3b2810404c.tar.bz2 | |
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 MERGE Fail more gracefu
* commit '1c12b44cab37c6287e5314668b8f5192f0501d68':
DO NOT MERGE Fail more gracefully on allocation failure
0 files changed, 0 insertions, 0 deletions