commit cc8aa2e130c6640116bd993f3313e639a96a3ff1
author Jean-Baptiste Queru <jbq@google.com> Thu Jun 13 22:34:46 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Jun 13 22:34:46 2013 -0700
tree cf518236c3786b7e27e711e219836fdf1cf845f9
parent 023dddfb4dd995dc8874a3667d42f728fa460e30
parent 87b319cb9673bf32c0f1c69ad70211ae6b248425

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

* commit '87b319cb9673bf32c0f1c69ad70211ae6b248425':

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;