| commit | 63e00fe4a7bc1ca8b85c205538938f42fe989fd8 | [log] [tgz] |
|---|---|---|
| author | Sergio Giro <sgiro@google.com> | Thu Jul 14 18:50:35 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jul 14 18:50:35 2016 +0000 |
| tree | 88fd472c799211f1e6ab921343c7b90510c4831e | |
| parent | 301893f33fad66db18f6be0a8bcfc73faf019933 [diff] | |
| parent | a3f816ac4ba4a63d76b4b85fad3475d1c5a2451a [diff] |
Merge \\\\\\\\\"DO NOT MERGE libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8\\\\\\\\\" into lmp-dev am: 8d2d6cedbb -s ours am: 71da8e7537 am: 5e03ed1dab am: b00e3603ef -s ours am: 72bad95df5 am: ae21a25383 am: 1062106a3b am: 9d6d33dba2 -s ours am: 8c335e2840 Change-Id: I956018c7a1ac4b01f085126260c28328c16c577a