Merge "DO NOT MERGE libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8 am: 5fce0542b6 am: d0ad14ca21 am: 3841c92912 -s ours am: 247ac63c69 -s ours am: 6179f1a56e am: 451f4b3d04 am: 3c85e4e5e7 -s ours am: baac6666fe am: 2858362ffe am: 7a0c6bf505 am: f96271187f -s ours am: 53d529a585 am: deb0b40f1f" into nyc-mr1-dev-plus-aosp

This commit is contained in:
Android Build Merger (Role) 2016-07-14 14:13:16 +00:00 committed by Android (Google) Code Review
commit 6b5de6a10c

Diff Content Not Available