commit d3ef89148cde944aa1b02a2e8410168a9695e208
author The Android Open Source Project <initial-contribution@android.com> Tue Nov 06 13:29:16 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Tue Nov 06 13:29:16 2012 -0800
tree 9015cdf92a7ed8a1276e53c7735de041a5e8e1d6
parent 5535a9e9806775dd09279e9fe415565ced30f3ae
parent a11e2d207e2e5d3a6d4cdd7c7a90f3c16348608d

am a11e2d20: Reconcile with jb-mr1-release - do not merge

* commit 'a11e2d207e2e5d3a6d4cdd7c7a90f3c16348608d':

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;