diff options
| author | Bart Sears <bsears@google.com> | 2015-08-27 01:37:47 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-27 01:37:47 +0000 |
| commit | 8bc53c125ab739db7bd34bd3b5c496c3f3a542f9 (patch) | |
| tree | 12f45ba4c45fe9f84ae0487b67b70ef4fdb5d1bb /libutils/Unicode_test.cpp | |
| parent | 15361abe395a89c725fb99dfdec036283c5df8bf (diff) | |
| parent | d239dbb2578ca70cb4cd44b78a0295bdd8af0e36 (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]
Diffstat (limited to 'libutils/Unicode_test.cpp')
0 files changed, 0 insertions, 0 deletions