| commit | e534b0e898e4a97f392b4132c8c6a571f2bdcb6f | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Thu Aug 20 20:47:41 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 20 20:47:41 2015 +0000 |
| tree | 24d57259fbbf96ba8aae0ca3efe8b7c23f7331e8 | |
| parent | a3cc32723905e35be68594843464f6fcceb7ee73 [diff] | |
| parent | 008807813e8fd703f89bf84c8f2c725bb19a434f [diff] |
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 allocation failure * commit '008807813e8fd703f89bf84c8f2c725bb19a434f': DO NOT MERGE Fail more gracefully on allocation failure