| commit | c03cf67eb55cb1a228e5c915ac4eb8f113a5af54 | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Thu Aug 20 19:09:38 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 20 19:09:38 2015 +0000 |
| tree | 36cf2411b213d0fcb3c1e278d13e46a6a1aeff6c | |
| parent | 3d97de8c77b214d865a52fb1a36541d6359b2872 [diff] | |
| parent | a3cc32723905e35be68594843464f6fcceb7ee73 [diff] |
am a3cc3272: am d4f0d88e: resolved conflicts for merge of eb10ccbc to lmp-dev * commit 'a3cc32723905e35be68594843464f6fcceb7ee73': Fail more gracefully on allocation failure