commit 8ffcbe9ddf894c34c0f72b4aebc376348568be94
author Ying Wang <wangying@google.com> Mon Oct 01 10:14:09 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Oct 01 10:14:09 2012 -0700
tree 437d1facc98d80542c81b038c97900acc35d66a0
parent ce4edcd3257e88b5068cf62fe9ee6e9ceb817a95
parent 34ab1d80d200bf4ea86a5e108c7c7ddf36419852

am 34ab1d80: am ef6a43c2: (-s ours) Drop current SDK as of build #482637 in jb-mr1-dev.

* commit '34ab1d80d200bf4ea86a5e108c7c7ddf36419852':
  Drop current SDK as of build #482637 in jb-mr1-dev.

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;