| commit | af34348be61c28f29413eea0ff13fedf4a94e7f8 | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Thu Aug 20 20:10:39 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 20 20:10:39 2015 +0000 |
| tree | 02759f20bff4fdf8e6f00b6ca73812b19b317cfa | |
| parent | 08e5c26e0c0f21b19bfc80e39720ef8dbc7d41c2 [diff] | |
| parent | e1a78e8ee94b4d344d3d04c8f66f8f860c779b30 [diff] |
am e1a78e8e: am efbc1bc8: am 32fe0815: am c663f602: am c03cf67e: am a3cc3272: am d4f0d88e: resolved conflicts for merge of eb10ccbc to lmp-dev * commit 'e1a78e8ee94b4d344d3d04c8f66f8f860c779b30': Fail more gracefully on allocation failure