merge in jb-mr2-release history after reset to jb-mr2-dev
diff --git a/current/android.jar b/current/android.jar
index 7ed3943..f074e9c 100644
--- a/current/android.jar
+++ b/current/android.jar
Binary files differ