tree cf8f449c1e5f087208c9d05da9e91d63859569ba
parent b4c163b7b1ba792be3ec5ffae28c198224efa458
parent fd900142f509eac5a5eaecb83c6e7b049a5f398e
author Sergio Giro <sgiro@google.com> 1468416234 +0000
committer android-build-merger <android-build-merger@google.com> 1468416234 +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

Change-Id: Ib057bbfd06a34eaad78dfca4cb30847db2443353