tree e9838955733df12c792d34ea17a38b70d9b28fa6
parent 28f28ce635cf562bd452eabcde534339a566fc2a
parent 5e03ed1dab2f96f7a9f7ffd22b10a1b7854900e2
author Sergio Giro <sgiro@google.com> 1468519250 +0000
committer android-build-merger <android-build-merger@google.com> 1468519250 +0000

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

Change-Id: I69b9c166dcd1f76cfe6555cae0580366f79258cc