commit 3fd4dfeb9bdc6eb9e7bcc60a65903a229bcc0a40
author Ying Wang <wangying@google.com> Thu May 30 19:14:34 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu May 30 19:14:34 2013 -0700
tree 7e3b0778abacfe37d468cfd01c71b8077f5dbc0d
parent e3c36df32b519c86e2cdf7276ea19b73077fb42b
parent ac46b3267459c832d6c6df15276b6f1a0518bc5c

am ac46b326: Update 18.txt

* commit 'ac46b3267459c832d6c6df15276b6f1a0518bc5c':
  Update 18.txt

api/18.txt

diff --git a/api/18.txt b/api/18.txt
index 9eef734..092fe16 100644
--- a/api/18.txt
+++ b/api/18.txt
@@ -12216,7 +12216,7 @@
     method public void removeCallback(android.media.MediaRouter.Callback);
     method public void removeUserRoute(android.media.MediaRouter.UserRouteInfo);
     method public void selectRoute(int, android.media.MediaRouter.RouteInfo);
-    field public static final int CALLBACK_FLAG_ACTIVE_SCAN = 1; // 0x1
+    field public static final int CALLBACK_FLAG_PERFORM_ACTIVE_SCAN = 1; // 0x1
     field public static final int CALLBACK_FLAG_UNFILTERED_EVENTS = 2; // 0x2
     field public static final int ROUTE_TYPE_LIVE_AUDIO = 1; // 0x1
     field public static final int ROUTE_TYPE_LIVE_VIDEO = 2; // 0x2
@@ -19864,6 +19864,7 @@
     field public static final java.lang.String ACTION_DATE_SETTINGS = "android.settings.DATE_SETTINGS";
     field public static final java.lang.String ACTION_DEVICE_INFO_SETTINGS = "android.settings.DEVICE_INFO_SETTINGS";
     field public static final java.lang.String ACTION_DISPLAY_SETTINGS = "android.settings.DISPLAY_SETTINGS";
+    field public static final java.lang.String ACTION_DREAM_SETTINGS = "android.settings.DREAM_SETTINGS";
     field public static final java.lang.String ACTION_INPUT_METHOD_SETTINGS = "android.settings.INPUT_METHOD_SETTINGS";
     field public static final java.lang.String ACTION_INPUT_METHOD_SUBTYPE_SETTINGS = "android.settings.INPUT_METHOD_SUBTYPE_SETTINGS";
     field public static final java.lang.String ACTION_INTERNAL_STORAGE_SETTINGS = "android.settings.INTERNAL_STORAGE_SETTINGS";