| commit | 1bfe66dbc26d3f4b05c15e9c5b89ad4f998c0989 | [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 | 5ae55f9f2c1455f0a6ac28398c81b6618d405d2a | |
| parent | e05f762f50e5a83bfdd09e015c8260a15f0ab519 [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: I4c6a67501017c5e78affc46cba81c4ad439bf6a7