commit 487faf9690f60f778b50e1ac23dee254f36a626b
author android-build-team Robot <android-build-team-robot@google.com> Thu Nov 09 05:44:20 2017 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Thu Nov 09 05:44:20 2017 +0000
tree d7b1755bf73c4aeaaaa6bb51b2909dde1d10eb39
parent 8dfd86b45efd0ebbdab39a887c3e72aad63a5722
parent a0c69d4986b508572059b78bc062ae3a4e64fb45

Merge cherrypicks of [3196053, 3195996, 3195997, 3195998, 3196073, 3196093, 3196113, 3195934, 3195999, 3196074, 3196133, 3196134, 3195914, 3195915, 3195916] into oc-mr1-release

Change-Id: Ic44a1dab2f79bf456089ce5ca31cbcb337f0cda2

sdk/images_armeabi-v7a_source.prop_template

diff --git a/sdk/images_armeabi-v7a_source.prop_template b/sdk/images_armeabi-v7a_source.prop_template
index d38fe89..19562d5 100644
--- a/sdk/images_armeabi-v7a_source.prop_template
+++ b/sdk/images_armeabi-v7a_source.prop_template
@@ -1,6 +1,6 @@
 Pkg.Desc=Android SDK Platform ${PLATFORM_VERSION}
 Pkg.UserSrc=false
-Pkg.Revision=1
+Pkg.Revision=2
 AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION}
 AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME}
 SystemImage.Abi=armeabi-v7a

sdk/images_x86_source.prop_template

diff --git a/sdk/images_x86_source.prop_template b/sdk/images_x86_source.prop_template
index c3bc0ea..ab2f0e8 100644
--- a/sdk/images_x86_source.prop_template
+++ b/sdk/images_x86_source.prop_template
@@ -1,6 +1,6 @@
 Pkg.Desc=Android SDK Platform ${PLATFORM_VERSION}
 Pkg.UserSrc=false
-Pkg.Revision=1
+Pkg.Revision=2
 AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION}
 AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME}
 SystemImage.Abi=x86