commit 062f3c1386a590822cd411c4be802955a64c8647
author Ying Wang <wangying@google.com> Tue Nov 06 11:03:24 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Tue Nov 06 11:03:24 2012 -0800
tree 9015cdf92a7ed8a1276e53c7735de041a5e8e1d6
parent 11416fc82da09abb7b2743a09091e0b2425e05b0
parent 94d1dc587264b19b93b52d560023aafd85dfa13b

am 94d1dc58: am bfb25615: (-s ours) [DO NOT MERGE]Drop current SDK as of JOP36 #524024 from jb-mr1-release

* commit '94d1dc587264b19b93b52d560023aafd85dfa13b':
  [DO NOT MERGE]Drop current SDK as of JOP36 #524024 from jb-mr1-release

current/android.jar

diff --git a/current/android.jar b/current/android.jar
index 79dd985..c1615bf 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 f9c522e..66bd25d 100644
--- a/current/framework.aidl
+++ b/current/framework.aidl
@@ -41,11 +41,7 @@
 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;