tree b7d58e6a6c975599436e044a420ccd041b53ddf8
parent c146d055620911a60b56be74300f2928710ab26e
parent 6cf2cef9ecda3038d86ca81830c371dca94e3d74
author Sergio Giro <sgiro@google.com> 1468522026 +0000
committer android-build-merger <android-build-merger@google.com> 1468522026 +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
am: 6cf2cef9ec  -s ours

Change-Id: I4bf9fb648a58d54632b658fa6f0a28d464c392e2