commit 023dddfb4dd995dc8874a3667d42f728fa460e30
author Jean-Baptiste Queru <jbq@google.com> Tue Feb 26 14:34:06 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Tue Feb 26 14:34:06 2013 -0800
tree cf518236c3786b7e27e711e219836fdf1cf845f9
parent eb754fc01b4e1f1a664ddbe375d56f624a053d19
parent 7e0bd69e3f230f53b60bc89d25acf6c06c920384

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

* commit '7e0bd69e3f230f53b60bc89d25acf6c06c920384':

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;