| commit | e1a78e8ee94b4d344d3d04c8f66f8f860c779b30 | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Thu Aug 20 19:47:14 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 20 19:47:14 2015 +0000 |
| tree | 903b0a6e352c23f5cc02cbd9c10ee55b0457380c | |
| parent | 030d058cb18fa70b3584dfd2e1e6a8b31b26f2dc [diff] | |
| parent | efbc1bc8e7e247a612966356c9063c6eca0b7188 [diff] |
am efbc1bc8: am 32fe0815: am c663f602: am c03cf67e: am a3cc3272: am d4f0d88e: resolved conflicts for merge of eb10ccbc to lmp-dev * commit 'efbc1bc8e7e247a612966356c9063c6eca0b7188': Fail more gracefully on allocation failure