tree 20d01391166a7b10922df30ee95e4a000f85643d
parent 069ecf3bdc74a3268cf59a6b125fcd902c19152f
parent 3c24dd8caf312d744086b897b22a72f10b7aee9a
author Elliott Hughes <enh@google.com> 1565296431 -0700
committer android-build-merger <android-build-merger@google.com> 1565296431 -0700

Merge "Use String8 for UTF16 to UTF8 conversion." am: 527c91320d am: c3b0712ed2
am: 3c24dd8caf

Change-Id: I80b2a53cbfea246f1341d6169809582ff2988a81