tree 69ac4305c3cfafa2db1f296cc740c58b31503f2e
parent 85d694cd0db37064b9594cebb635bc0f3bc2c5b6
parent baac6666fedd021d82218bcf07d81f143750d87c
author Sergio Giro <sgiro@google.com> 1468503649 +0000
committer android-build-merger <android-build-merger@google.com> 1468503649 +0000

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

Change-Id: I78b737a0a19a9ae692fd94f1b3ca8d0870291c96