tree fb03ff5a8280e87fa41ee14f4334b2dcce076cf0
parent eb868b3717f391951258b6b249862f02d83e2ea1
parent 7b0c8479ae68c6596df21879c6470ff21560ea03
author Christopher Wiley <wiley@google.com> 1454363040 +0000
committer android-build-merger <android-build-merger@google.com> 1454363040 +0000

Merge "Add support for decoding UTF16 to UTF8" am: ac4728f8ba
am: 7b0c8479ae

* commit '7b0c8479ae68c6596df21879c6470ff21560ea03':
  Add support for decoding UTF16 to UTF8