tree 1d8a1cb8c99841e158540c1b103688e3f0b683c8
parent 462dde07cefeeb30514a331c9605d137978c0a32
parent 01799f43819878262f321a45232ff3f9858e4a62
author Sergio Giro <sgiro@google.com> 1468416446 +0000
committer android-build-merger <android-build-merger@google.com> 1468416446 +0000

Revert \\\\\\\\\\\\"libutils/Unicode.cpp: Correct length computation and add checks for utf16->utf8\\\\\\\\\\\\" am: 311002936e am: ddd0051968 am: b218b2d34d am: 605de74373 am: 37826f5613 am: 80473d5d33 am: c06d338ad7 am: e059f5e325 am: 85d694cd0d am: 9b169f8baf am: fd900142f5  -s ours
am: 01799f4381

Change-Id: I083677a4d84985dc671f7f35544aa5d2dbceb59c