tree ebb08893f92efd2a3aacd0f33cfb894aeee171c6
parent 2133b9839e18f5ced88724ec1e213e92614ff557
parent 21f0d7404351bf515f4d7ef7b205d94ca89cba22
author Elliott Hughes <enh@google.com> 1565297063 -0700
committer android-build-merger <android-build-merger@google.com> 1565297063 -0700

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

Change-Id: Idb80a72f498022a40cfe036ad8d9bfdb92454713