OSDN Git Service

Merge "Add support for decoding UTF16 to UTF8" am: ac4728f8ba am: 7b0c8479ae
authorChristopher Wiley <wiley@google.com>
Mon, 1 Feb 2016 21:46:24 +0000 (21:46 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 1 Feb 2016 21:46:24 +0000 (21:46 +0000)
am: 4ab1dbe559

* commit '4ab1dbe5594b672532db5996dce3b77dbedd7580':
  Add support for decoding UTF16 to UTF8


Trivial merge