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