commit a06f8612e35312a274970d0fd5d144c452a1c32d
author The Android Automerger <android-build@google.com> Sun Jun 02 05:55:56 2013 -0700
committer The Android Automerger <android-build@google.com> Sun Jun 02 05:55:56 2013 -0700
tree 7e3b0778abacfe37d468cfd01c71b8077f5dbc0d
parent ac46b3267459c832d6c6df15276b6f1a0518bc5c
parent d5c9fff670b4067d62a80d90a0bfc09f684a6b85

merge in jb-mr2-release history after reset to jb-mr2-dev

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";

renderscript/Android.mk

diff --git a/renderscript/Android.mk b/renderscript/Android.mk
index 76b405a..b8c1fb5 100644
--- a/renderscript/Android.mk
+++ b/renderscript/Android.mk
@@ -43,7 +43,7 @@
 ##################################
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := android.support.v8.renderscript
+LOCAL_MODULE := android-support-v8-renderscript
 LOCAL_SRC_FILES := lib/javalib.jar
 LOCAL_MODULE_CLASS := JAVA_LIBRARIES
 LOCAL_MODULE_TAGS := optional