merge in jb-mr1-release history after reset to jb-mr1-dev
diff --git a/current/android.jar b/current/android.jar
index b0461ad..411a27c 100644
--- a/current/android.jar
+++ b/current/android.jar
Binary files differ