commit c15624c76286a15d127136306f53f1105a9ccc51
author Ying Wang <wangying@google.com> Tue Nov 13 15:22:59 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Tue Nov 13 15:22:59 2012 -0800
tree cf518236c3786b7e27e711e219836fdf1cf845f9
parent 7b8eccfd128bee09c660e0e2110e43307189e2fa
parent 1450c47ba8cf327d9681eb34fda0754feb208ff9

am 1450c47b: am 5243f864: am 07a523b2: Drop official SDK 17

* commit '1450c47ba8cf327d9681eb34fda0754feb208ff9':
  Drop official SDK 17

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;