Merge "Fix FastScroller regression for non-UI threads"
diff --git a/api/current.txt b/api/current.txt
index a4aa751..6769aa3 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -5783,6 +5783,7 @@
field public static final java.lang.String ACCOUNT_SERVICE = "account";
field public static final java.lang.String ACTIVITY_SERVICE = "activity";
field public static final java.lang.String ALARM_SERVICE = "alarm";
+ field public static final java.lang.String APP_OPS_SERVICE = "appops";
field public static final java.lang.String AUDIO_SERVICE = "audio";
field public static final int BIND_ABOVE_CLIENT = 8; // 0x8
field public static final int BIND_ADJUST_WITH_ACTIVITY = 128; // 0x80
diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java
index 5c37206..81a5e57 100644
--- a/core/java/android/content/Context.java
+++ b/core/java/android/content/Context.java
@@ -2285,8 +2285,6 @@
*
* @see #getSystemService
* @see android.app.AppOpsManager
- *
- * @hide
*/
public static final String APP_OPS_SERVICE = "appops";
diff --git a/data/fonts/AndroidEmoji.ttf b/data/fonts/AndroidEmoji.ttf
index 92bf047..569cbab 100644
--- a/data/fonts/AndroidEmoji.ttf
+++ b/data/fonts/AndroidEmoji.ttf
Binary files differ