commit 7e0bd69e3f230f53b60bc89d25acf6c06c920384
author Jean-Baptiste Queru <jbq@google.com> Tue Feb 26 14:31:37 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Tue Feb 26 14:31:37 2013 -0800
tree f16937f99a210f355bb5efc0fe0b82fd64d3722f
parent 1450c47ba8cf327d9681eb34fda0754feb208ff9
parent 12b61826cdee963d0d01f29bf03c11f735f08a41

am 12b61826: am 61ea9d98: Reconcile with jb-mr1-release - do not merge

* commit '12b61826cdee963d0d01f29bf03c11f735f08a41':

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;