am f64e08b5: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
* commit 'f64e08b51f35689d1c8d6bfa4fa7606f7ea8e90c':
Drop official release of SDK 18.
Drop official release of SDK 18.
diff --git a/api/18.txt b/api/18.txt
index 02b95a0..ea3e1ae 100644
--- a/api/18.txt
+++ b/api/18.txt
@@ -27660,10 +27660,10 @@
method public void setAlpha(float);
method public void setTransformationType(int);
method public java.lang.String toShortString();
- field public static int TYPE_ALPHA;
- field public static int TYPE_BOTH;
- field public static int TYPE_IDENTITY;
- field public static int TYPE_MATRIX;
+ field public static final int TYPE_ALPHA = 1; // 0x1
+ field public static final int TYPE_BOTH = 3; // 0x3
+ field public static final int TYPE_IDENTITY = 0; // 0x0
+ field public static final int TYPE_MATRIX = 2; // 0x2
field protected float mAlpha;
field protected android.graphics.Matrix mMatrix;
field protected int mTransformationType;
diff --git a/current/android.jar b/current/android.jar
index 263520b..94e140d 100644
--- a/current/android.jar
+++ b/current/android.jar
Binary files differ
diff --git a/current/framework.aidl b/current/framework.aidl
index fdb392f..d580719 100644
--- a/current/framework.aidl
+++ b/current/framework.aidl
@@ -12,6 +12,7 @@
parcelable android.content.Intent;
parcelable android.content.IntentSender;
parcelable android.content.PeriodicSync;
+parcelable android.content.SyncRequest;
parcelable android.content.SyncStats;
parcelable android.content.res.Configuration;
parcelable android.database.CursorWindow;
diff --git a/current/uiautomator.jar b/current/uiautomator.jar
index 4ef880d..3a31978 100644
--- a/current/uiautomator.jar
+++ b/current/uiautomator.jar
Binary files differ
diff --git a/tools/darwin/aapt b/tools/darwin/aapt
index 20b29e3..3845e22 100755
--- a/tools/darwin/aapt
+++ b/tools/darwin/aapt
Binary files differ
diff --git a/tools/darwin/aidl b/tools/darwin/aidl
index 650444e..7f17f62 100755
--- a/tools/darwin/aidl
+++ b/tools/darwin/aidl
Binary files differ
diff --git a/tools/dx b/tools/dx
index e5cedff..632af43 100755
--- a/tools/dx
+++ b/tools/dx
@@ -39,7 +39,7 @@
if [ ! -r "$libdir/$jarfile" ]; then
# set dx.jar location for the SDK case
- libdir=`dirname "$progdir"`/platform-tools/lib
+ libdir="$libdir/lib"
fi
diff --git a/tools/lib/dx.jar b/tools/lib/dx.jar
index f89282f..746163b 100644
--- a/tools/lib/dx.jar
+++ b/tools/lib/dx.jar
Binary files differ
diff --git a/tools/linux/aapt b/tools/linux/aapt
index 6f5364a..27e739f 100755
--- a/tools/linux/aapt
+++ b/tools/linux/aapt
Binary files differ
diff --git a/tools/linux/aidl b/tools/linux/aidl
index 7a1c0e4..cfee320 100755
--- a/tools/linux/aidl
+++ b/tools/linux/aidl
Binary files differ