| commit | 4b924a9532b7e7b18808ab68e5f0891be770227c | [log] [tgz] |
|---|---|---|
| author | Sergio Giro <sgiro@google.com> | Thu Jul 14 20:02:18 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jul 14 20:02:18 2016 +0000 |
| tree | 5d177a6f99669871d6dfe210d90fcc82afdf421b | |
| parent | a4722679a9a9a40a1a1b2afce8a60c182745ca44 [diff] | |
| parent | 80e1f0c746791f29db9280aef88a51b8f8b662f3 [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: e4e225515d am: b7e8a71fa8 -s ours Change-Id: I15e5ae3b62f4aea96d48537e54f643e966290f34