| commit | dc837a51132851d70ba076e3a50d7b7725191f5b | [log] [tgz] |
|---|---|---|
| author | Sergio Giro <sgiro@google.com> | Thu Jul 14 18:53:09 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jul 14 18:53:09 2016 +0000 |
| tree | 22b1d575b6598b063c910657a30088be07a498e0 | |
| parent | 1b8407e145f4ec9755ad9e4f691536665572662f [diff] | |
| parent | 63e00fe4a7bc1ca8b85c205538938f42fe989fd8 [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 Change-Id: I9f59159f2a0cdd9c235a4304a8ac8020c917c1cd