commit 153d1cdb76b2147df97d7a6b98cd05babda9528f
author The Android Automerger <android-build@google.com> Wed Jul 22 01:05:16 2015 -0700
committer The Android Automerger <android-build@google.com> Wed Jul 22 01:05:16 2015 -0700
tree bbd4f2445ef9fce125a67328ee5967740b8d5aee
parent 5ba60b1c255efee72316f002bc850908b7f0fe4e
parent 13fbf3cb4cf288f0bbab61fdeccff3633e3a180a

merge in mnc-release history after reset to mnc-dev

libs/minikin/Measurement.cpp

diff --git a/libs/minikin/Measurement.cpp b/libs/minikin/Measurement.cpp
index a7bc64b..0b68ac5 100644
--- a/libs/minikin/Measurement.cpp
+++ b/libs/minikin/Measurement.cpp
@@ -41,8 +41,7 @@
             clusterWidth = charAdvance;
         }
     }
-    if (offset < start + count && layout.getCharAdvance(offset - layoutStart) == 0.0f &&
-            !GraphemeBreak::isGraphemeBreak(buf, start, count, offset)) {
+    if (offset < start + count && layout.getCharAdvance(offset - layoutStart) == 0.0f) {
         // In the middle of a cluster, distribute width of cluster so that each grapheme cluster
         // gets an equal share.
         // TODO: get caret information out of font when that's available