tree f041c9427867021a2d39bc3cf31775868e354746
parent 8cb82f22e0453606f100159a9528afb4b5160238
parent 7ec88a729ca2ef66671b8f6961cc2f3d8323cddb
author Christopher Wiley <wiley@google.com> 1454363184 +0000
committer android-build-merger <android-build-merger@google.com> 1454363184 +0000

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

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