tree 28989159b63ebb51d1aa2d4627e5e24d37effd92
parent cdafc2541c37f422b2fd59329354c5cbd74983f0
parent bfd0b68b7478e5ee2cf4a029a51b337aeeac6437
author Sergio Giro <sgiro@google.com> 1468520963 +0000
committer android-build-merger <android-build-merger@google.com> 1468520963 +0000

Merge \\\\\\\"DO NOT MERGE Add bound checks to utf16_to_utf8\\\\\\\" into lmp-dev am: 5f34f40530  -s ours am: 20ae503b50 am: 012d1246ce am: e6373adbec  -s ours am: 9f51ebbc8b am: b47df5d9e2
am: bfd0b68b74

Change-Id: I4699cc34e9d1045ddda8406d0b315891198870ff