diff options
| author | Bart Sears <bsears@google.com> | 2015-08-27 01:27:29 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-27 01:27:29 +0000 |
| commit | d239dbb2578ca70cb4cd44b78a0295bdd8af0e36 (patch) | |
| tree | 26356da86e858df6d4b281f1b5f2b83a1d629d4c | |
| parent | 5b33306dba456ec906f7c9bd522681c1de137f78 (diff) | |
| parent | 170bde83ae90e03b7964edf2a00da6f83c406910 (diff) | |
| download | core-d239dbb2578ca70cb4cd44b78a0295bdd8af0e36.tar.gz | |
am 170bde83: (-s ours) resolved conflicts for merge of 7c327194 to lmp-mr1-ub-devmarshmallow-dev
* commit '170bde83ae90e03b7964edf2a00da6f83c406910':
libutils: fix overflow in SharedBuffer [DO NOT MERGE]
0 files changed, 0 insertions, 0 deletions