Merge "getTextRunCursor gets deprecated in SpannableStringBuilder" into honeycomb-mr1

api/current.xml

@@ -194914,7 +194914,7 @@
  synchronized="false"
  static="false"
  final="false"
- deprecated="not deprecated"
+ deprecated="deprecated"
  visibility="public"
 >
 <parameter name="contextStart" type="int">
@@ -266773,7 +266773,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="arg0" type="T">
+<parameter name="t" type="T">
 </parameter>
 </method>
 </interface>

core/java/android/text/SpannableStringBuilder.java

@@ -1192,7 +1192,9 @@ implements CharSequence, GetChars, Spannable, Editable, Appendable,
      * CURSOR_AT_OR_BEFORE, or CURSOR_AT
      * @param p the Paint object that is requesting this information
      * @return the offset of the next position, or -1
+     * @deprecated This is an internal method, refrain from using it in your code
      */
+    @Deprecated
     public int getTextRunCursor(int contextStart, int contextEnd, int flags, int offset,
             int cursorOpt, Paint p) {