| commit | 51ec339e9fb40dc25e7ae168c42b2c239b449995 | [log] [tgz] |
|---|---|---|
| author | Bart Sears <bsears@google.com> | Thu Aug 27 05:06:37 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 05:06:37 2015 +0000 |
| tree | 5672430a9f41c6eb948db44ee1706bd3fb354ba9 | |
| parent | aaf8e52164676d18ccbddf7c5cf37712c0711d04 [diff] | |
| parent | 33ca25c7c96606a92248d5a0e350c398c757665e [diff] |
am 7465c368: am 8bc53c12: am d239dbb2: am 170bde83: (-s ours) resolved conflicts for merge of 7c327194 to lmp-mr1-ub-dev * commit '7465c368f3e060506233a26ed1f827e646107962': libutils: fix overflow in SharedBuffer [DO NOT MERGE]