commit d270339f90c948c29d4346ec7e263694daa0a346
author Ying Wang <wangying@google.com> Fri Nov 02 17:53:38 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Nov 02 17:53:38 2012 -0700
tree 51bac729f7186c76f114019f891c6388dc2022b7
parent 81d97c8131d4abc56c12663d70d505e581f11476
parent 11416fc82da09abb7b2743a09091e0b2425e05b0

am 11416fc8: am 118e3fd9: (-s ours) [DO NOT MERGE]Drop current SDK as of JOP32C #522705 from jb-mr1-release

* commit '11416fc82da09abb7b2743a09091e0b2425e05b0':
  [DO NOT MERGE]Drop current SDK as of JOP32C #522705 from jb-mr1-release

current/android.jar

diff --git a/current/android.jar b/current/android.jar
index c1615bf..411a27c 100644
--- a/current/android.jar
+++ b/current/android.jar
Binary files differ

current/framework.aidl

diff --git a/current/framework.aidl b/current/framework.aidl
index 66bd25d..f9c522e 100644
--- a/current/framework.aidl
+++ b/current/framework.aidl
@@ -41,7 +41,11 @@
 parcelable android.graphics.Rect;
 parcelable android.graphics.Region;
 parcelable android.location.Criteria;
+parcelable android.location.Geofence;
 parcelable android.location.Location;
+parcelable android.location.LocationRequest;
+parcelable com.android.internal.location.ProviderProperties;
+parcelable com.android.internal.location.ProviderRequest;
 parcelable android.telephony.ServiceState;
 interface com.android.internal.telephony.IPhoneSubInfo;
 interface com.android.internal.telephony.ITelephony;