| commit | 5aa887ef44238e9a727564fe9051933f8b42e399 | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Thu Aug 20 20:17:34 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 20 20:17:34 2015 +0000 |
| tree | 45e6c5d00c653db833f26e6f14e2adb26cf3871c | |
| parent | 8a064aa83ad590b61ddd84e678c59f0d1f68106c [diff] | |
| parent | 59bfb7aa42ce2404da2547e7852e1a1215c6af22 [diff] |
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 allocation failure * commit '59bfb7aa42ce2404da2547e7852e1a1215c6af22': DO NOT MERGE Fail more gracefully on allocation failure