commit 8e4ac6bd724812d561886446d2d27f470dc5e18a
author Nick Kralevich <nnk@google.com> Sat Aug 08 07:38:47 2015 -0700
committer Nick Kralevich <nnk@google.com> Sat Aug 08 07:38:47 2015 -0700
tree 653dbbe6b71e83a62832b9d44b319e6e937d091c
parent e2ee1baff8f1c0275e28ad4ccd5018545933a6e3
parent 5e9725191f0e263e235c8cf014e11aeae610993b

resolve merge conflicts of 5e972519 to jb-mr1.1-docs

Change-Id: Ie5af5f01ead4d29cf84d2951606ddcd9f95a5b70

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 4f2daac..22e3927 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=2
+Pkg.Revision=4
 AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION}
 AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME}
 SystemImage.Abi=armeabi-v7a

sdk/images_armeabi_source.prop_template

diff --git a/sdk/images_armeabi_source.prop_template b/sdk/images_armeabi_source.prop_template
index 8644d10..906e378 100644
--- a/sdk/images_armeabi_source.prop_template
+++ b/sdk/images_armeabi_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

sdk/images_x86_source.prop_template

diff --git a/sdk/images_x86_source.prop_template b/sdk/images_x86_source.prop_template
index a587cd1..90024ea 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