| commit | a3f816ac4ba4a63d76b4b85fad3475d1c5a2451a | [log] [tgz] |
|---|---|---|
| author | Sergio Giro <sgiro@google.com> | Thu Jul 14 18:47:12 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jul 14 18:47:12 2016 +0000 |
| tree | e4ccddad97ea49c5c928ce0978cdec92e8820fd9 | |
| parent | 73cc87c8fd138aacc3aa776cb20fe2469fe36786 [diff] | |
| parent | 629aee61ae6915f80bce9ed6d5246210693d89b5 [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 Change-Id: Id26c22b458fcd1b7ad32c58449dd9574bc464ad3