| commit | 32fe08156c361a0943b99348ecba5fdbe8dc8985 | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Thu Aug 20 19:31:10 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 20 19:31:10 2015 +0000 |
| tree | 5cbb34759999698c9920a784dd62239081f239e9 | |
| parent | 49cfd20030d335356e350f6417c690af7f175ea7 [diff] | |
| parent | c663f602e1b6e5405b1ae56763dfd004c1f62567 [diff] |
am c663f602: am c03cf67e: am a3cc3272: am d4f0d88e: resolved conflicts for merge of eb10ccbc to lmp-dev * commit 'c663f602e1b6e5405b1ae56763dfd004c1f62567': Fail more gracefully on allocation failure