| commit | d615e8b32dc8662079a34aaa07e52a56d47ae672 | [log] [tgz] |
|---|---|---|
| author | Bart Sears <bsears@google.com> | Thu Aug 27 01:37:47 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 01:37:47 2015 +0000 |
| tree | 12f45ba4c45fe9f84ae0487b67b70ef4fdb5d1bb | |
| parent | 23700ca18a0cc2e4a2aa5e2455ccedaffdad4cbb [diff] | |
| parent | f5322d2ac76546c28d43603b6be9cdb2e060fb39 [diff] |
am d239dbb2: am 170bde83: (-s ours) resolved conflicts for merge of 7c327194 to lmp-mr1-ub-dev * commit 'd239dbb2578ca70cb4cd44b78a0295bdd8af0e36': libutils: fix overflow in SharedBuffer [DO NOT MERGE]