| commit | 6a707b3b576346dff2dc5b9334c43c5d0ac81e93 | [log] [tgz] |
|---|---|---|
| author | Sergio Giro <sgiro@google.com> | Thu Jul 14 19:55:04 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jul 14 19:55:04 2016 +0000 |
| tree | 5d177a6f99669871d6dfe210d90fcc82afdf421b | |
| parent | dd46f8090a3f7d289a58469c9b3a57fb9e58eb2a [diff] | |
| parent | dc837a51132851d70ba076e3a50d7b7725191f5b [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 am: c525915576 am: a1d67c3bbb -s ours Change-Id: Icba5257f1398b07c25c4a7d78fadd95ee87f5253