tree c291cd91102aeb598b2e8ec68551726177fe7f7a
parent 109d7d23c57dd740af188109ee84ef5fae14617a
parent 53d529a585bd507b09ff23f6ee798707bd2cee2d
author Sergio Giro <sgiro@google.com> 1468505146 +0000
committer android-build-merger <android-build-merger@google.com> 1468505146 +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 am: 2858362ffe am: 7a0c6bf505 am: f96271187f  -s ours
am: 53d529a585

Change-Id: Ia49dd230eb055a8dba4306ecbdf7dc10098acccb