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