| commit | 80e1f0c746791f29db9280aef88a51b8f8b662f3 | [log] [tgz] |
|---|---|---|
| author | Sergio Giro <sgiro@google.com> | Thu Jul 14 19:26:36 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jul 14 19:26:36 2016 +0000 |
| tree | 22b1d575b6598b063c910657a30088be07a498e0 | |
| parent | ae9b5fff50441aff4e62ddeb1b3f69ba98329288 [diff] | |
| parent | 1bfe66dbc26d3f4b05c15e9c5b89ad4f998c0989 [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 Change-Id: I0756cab5ef2d4f3d8becff9e576548cd46de49f8