| commit | 9d6d33dba2ca020ebedc1bae5ae56449a2fdb5bc | [log] [tgz] |
|---|---|---|
| author | Sergio Giro <sgiro@google.com> | Thu Jul 14 18:29:27 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jul 14 18:29:27 2016 +0000 |
| tree | 4ac6240422cab93965b9ad0d1bfeab00af1c07fb | |
| parent | 1aad4b61cbfad574ed0ac04be0148e8628521145 [diff] | |
| parent | 1062106a3b74ed0317eb0fa7a1b6f108253766e7 [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 Change-Id: I441fc693e0f6861160ebc615b2ba15feba29e1a7