| commit | c7482267b51d174ce1746c726740feb8374988b4 | [log] [tgz] |
|---|---|---|
| author | Bart Sears <bsears@google.com> | Thu Aug 27 01:38:06 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 01:38:06 2015 +0000 |
| tree | 8520577f6da9e7d6ceff0793279a7d9f0ee516e7 | |
| parent | d14331f11941e56e9f8e1019739ece433d23a6de [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]