tree b6480175e4a4d34b0285101874cd847a5a6f5b3d
parent 5ced2681a8809fefa67f5f62ee55b98d187f9b72
author Elliott Hughes <enh@google.com> 1376437381 -0700
committer The Android Automerger <android-build@android.com> 1376441351 -0700

Work around icu4c causing canEncode to always return true for surrogates.

Bug: 10310751

(cherry picked from commit bb317b5a6ff071ee4ffa0b4e811367be962238b7)

Change-Id: Id31ea5715c1e3f744ed8eb33d6a7f3cca03159d1