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

Change-Id: I956018c7a1ac4b01f085126260c28328c16c577a
This commit is contained in:
Sergio Giro 2016-07-14 18:50:35 +00:00 committed by android-build-merger
commit c525915576

Diff Content Not Available