tree 2cf96a5d8cf34729b5531f1990204662eb468e93
parent ef4f4238a768a46667e49da5c5601bdda73c5354
author Elliott Hughes <enh@google.com> 1376447305 -0700
committer The Android Automerger <android-build@android.com> 1376509218 -0700

More Charset test fixes.

Bug: 10210999

(cherry picked from commit c44b103bfd1a79762811d2125e9b94ce37300a44)

Change-Id: If28d9e2eb3d1d148863f0a08c1e17371918fcaa2