commit 87b319cb9673bf32c0f1c69ad70211ae6b248425
author Jean-Baptiste Queru <jbq@google.com> Thu Jun 13 22:31:05 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Jun 13 22:31:05 2013 -0700
tree f16937f99a210f355bb5efc0fe0b82fd64d3722f
parent 7e0bd69e3f230f53b60bc89d25acf6c06c920384
parent b3ce93461480575c5e9e7bf2bbc9d11b2b714c85

am b3ce9346: am 91e4fd6c: am 61ea9d98: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'b3ce93461480575c5e9e7bf2bbc9d11b2b714c85':

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;