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)
commit040424fdf9378cab658847f97050f725f4d7bdc3
treef66bf6b00d55d6db355609ac0ff9526c06a6ecaf
parent1d52ba3883775ccaf3104d10787479bada55a0b4
parent4ab1dbe5594b672532db5996dce3b77dbedd7580
Merge "Add support for decoding UTF16 to UTF8" am: ac4728f8ba am: 7b0c8479ae
am: 4ab1dbe559

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