am 72521860: Merge change I8f657a99 into eclair

Merge commit '725218602e8505cd6fe3075253fcb792727e2431' into eclair-plus-aosp

* commit '725218602e8505cd6fe3075253fcb792727e2431':
  Avoid a crash trying to get a substring whose start is after its end.

core/java/android/widget/TextView.java

@@ -4531,6 +4531,11 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
                     // Now use the delta to determine the actual amount of text
                     // we need.
                     partialEndOffset += delta;
+                    if (partialStartOffset > N) {
+                        partialStartOffset = N;
+                    } else if (partialStartOffset < 0) {
+                        partialStartOffset = 0;
+                    }
                     if (partialEndOffset > N) {
                         partialEndOffset = N;
                     } else if (partialEndOffset < 0) {