tree 9a014a06d0b1334a97bc8f6e1be0d9adec56553c
parent 6359f8dc1049030683d9a43483f2016ce7f9d112
parent 9a59d64ecdf8cd427b3b92c6898bc698197be684
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