tree 185493089dc03a599227055784b3a57ed750a680
parent f73212d5c69ddec1820d1fadc59459af11888163
parent 75ec78a09661ccbcbc28fa3a84749d02392b17f9
author Android Build Merger (Role) <android-build-merger@google.com> 1468520208 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1468520209 +0000

Merge "Add bound checks to utf16_to_utf8 am: 9b39ebe132 am: 856a04b27e" into nyc-mr1-dev-plus-aosp