merge in jb-mr2-release history after reset to jb-mr2-dev
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
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