| commit | 33ca25c7c96606a92248d5a0e350c398c757665e | [log] [tgz] |
|---|---|---|
| author | Bart Sears <bsears@google.com> | Thu Aug 27 04:53:23 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 04:53:23 2015 +0000 |
| tree | 8c31250a527d15d67e52f8d8871ae6062178ee22 | |
| parent | 5e7943d7fee31ec2bf6a5f35e88a933eb48ff13f [diff] | |
| parent | d615e8b32dc8662079a34aaa07e52a56d47ae672 [diff] |
am 8bc53c12: am d239dbb2: am 170bde83: (-s ours) resolved conflicts for merge of 7c327194 to lmp-mr1-ub-dev * commit '8bc53c125ab739db7bd34bd3b5c496c3f3a542f9': libutils: fix overflow in SharedBuffer [DO NOT MERGE]