| commit | 9a57d1cb51ef14a666eefb32b245dd47cf79844e | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Thu Aug 20 20:22:45 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 20 20:22:45 2015 +0000 |
| tree | 0b38a882fe3a68421f65fddd3fa2a979a449a5ff | |
| parent | 150d750e2933780540355c5b60d6e70adfaf858b [diff] | |
| parent | af34348be61c28f29413eea0ff13fedf4a94e7f8 [diff] |
am af34348b: am e1a78e8e: am efbc1bc8: am 32fe0815: am c663f602: am c03cf67e: am a3cc3272: am d4f0d88e: resolved conflicts for merge of eb10ccbc to lmp-dev * commit 'af34348be61c28f29413eea0ff13fedf4a94e7f8': Fail more gracefully on allocation failure