commit 7951e688b3873d2cadb65c736096203d329a50ee
author The Android Automerger <android-build@android.com> Thu Apr 11 05:56:12 2013 -0700
committer The Android Automerger <android-build@android.com> Thu Apr 11 05:56:12 2013 -0700
tree e4ab5c54c009ca953c46cb71c78fac9c24883ee9
parent 13e20fc82daf9e04fa2ed44e6b4b940ed487ee09
parent 8970fe287e798d543c0ac9aff2e076ba6ba4746e

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 55c2989..9ac5af3 100644
--- a/api/18.txt
+++ b/api/18.txt
@@ -16423,7 +16423,6 @@
     method public static final void setThreadPriority(int, int) throws java.lang.IllegalArgumentException, java.lang.SecurityException;
     method public static final void setThreadPriority(int) throws java.lang.IllegalArgumentException, java.lang.SecurityException;
     method public static final deprecated boolean supportsProcesses();
-    field public static final int BLUETOOTH_GID = 2000; // 0x7d0
     field public static final int FIRST_APPLICATION_UID = 10000; // 0x2710
     field public static final int LAST_APPLICATION_UID = 19999; // 0x4e1f
     field public static final int PHONE_UID = 1001; // 0x3e9

current/android.jar

diff --git a/current/android.jar b/current/android.jar
index de4cea7..8b5604a 100644
--- a/current/android.jar
+++ b/current/android.jar
Binary files differ