commit 2223fae1c84102caf4e70e659996bd1cd26732e8
author Ying Wang <wangying@google.com> Wed Oct 03 11:01:26 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Oct 03 11:01:26 2012 -0700
tree ba51e4eac346bb062a01f6bd770fe5c8b35e12fb
parent 34ab1d80d200bf4ea86a5e108c7c7ddf36419852
parent 16331d95a6d3749fa33f0030dd4cd0a287802d53

am 16331d95: am 6ab59c98: am 7337fade: Add prebuilts/sdk/16/uiautomator.jar as of JZO54K  #485486

* commit '16331d95a6d3749fa33f0030dd4cd0a287802d53':
  Add prebuilts/sdk/16/uiautomator.jar as of JZO54K  #485486

current/android.jar

diff --git a/current/android.jar b/current/android.jar
index f5e4ea2..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;