Merge "Fix bug #8599905 Add simple BidiFormatter getInstance() helper API" into jb...

diff --combined api/current.txt
index 2fc9851,7e6a405..0c3eb02
--- 1/api/current.txt
--- 2/api/current.txt
+++ b/api/current.txt
@@@ -6650,9 -6650,7 +6650,9 @@@ package android.content.pm 
      field public static final int LAUNCH_SINGLE_TOP = 1; // 0x1
      field public static final int SCREEN_ORIENTATION_BEHIND = 3; // 0x3
      field public static final int SCREEN_ORIENTATION_FULL_SENSOR = 10; // 0xa
 +    field public static final int SCREEN_ORIENTATION_FULL_USER = 13; // 0xd
      field public static final int SCREEN_ORIENTATION_LANDSCAPE = 0; // 0x0
 +    field public static final int SCREEN_ORIENTATION_LOCKED = 14; // 0xe
      field public static final int SCREEN_ORIENTATION_NOSENSOR = 5; // 0x5
      field public static final int SCREEN_ORIENTATION_PORTRAIT = 1; // 0x1
      field public static final int SCREEN_ORIENTATION_REVERSE_LANDSCAPE = 8; // 0x8
@@@ -6662,8 -6660,6 +6662,8 @@@
      field public static final int SCREEN_ORIENTATION_SENSOR_PORTRAIT = 7; // 0x7
      field public static final int SCREEN_ORIENTATION_UNSPECIFIED = -1; // 0xffffffff
      field public static final int SCREEN_ORIENTATION_USER = 2; // 0x2
 +    field public static final int SCREEN_ORIENTATION_USER_LANDSCAPE = 11; // 0xb
 +    field public static final int SCREEN_ORIENTATION_USER_PORTRAIT = 12; // 0xc
      field public static final int UIOPTION_SPLIT_ACTION_BAR_WHEN_NARROW = 1; // 0x1
      field public int configChanges;
      field public int flags;
@@@ -22569,6 -22565,7 +22569,7 @@@ package android.text.bidi 
      method public java.lang.String dirAttrValue(java.lang.String, android.text.TextDirectionHeuristic);
      method public java.lang.String dirAttrValue(boolean);
      method public java.lang.String endEdge();
+     method public static android.text.bidi.BidiFormatter getInstance();
      method public static android.text.bidi.BidiFormatter getInstance(boolean);
      method public static android.text.bidi.BidiFormatter getInstance(java.util.Locale);
      method public boolean getStereoReset();