commit 6130dc0ff08e20ed202bc6c862abecf45eb2e2a7
author gitbuildkicker <android-build@google.com> Sun Oct 09 00:06:09 2016 -0700
committer gitbuildkicker <android-build@google.com> Sun Oct 09 00:06:09 2016 -0700
tree cdea9e854f012f28f04b1d5be40aebcbb868663d
parent 68bb03d5766099fa7b01681a1231d6b2dbeef248
parent 434b497b6b1e3698a05b9700e26e540dce3e6446

merge in nyc-mr1-release history after reset to nyc-mr1-dev

sdk/build_tools_source.prop_template

diff --git a/sdk/build_tools_source.prop_template b/sdk/build_tools_source.prop_template
index d72f334..5d62307 100644
--- a/sdk/build_tools_source.prop_template
+++ b/sdk/build_tools_source.prop_template
@@ -1,4 +1,3 @@
 Pkg.UserSrc=false
-#Pkg.Revision=${PLATFORM_SDK_VERSION}.0.0
-Pkg.Revision=24.0.1
+Pkg.Revision=${PLATFORM_SDK_VERSION}.0.0
 

sdk/plat_tools_source.prop_template

diff --git a/sdk/plat_tools_source.prop_template b/sdk/plat_tools_source.prop_template
index 7912856..5d62307 100644
--- a/sdk/plat_tools_source.prop_template
+++ b/sdk/plat_tools_source.prop_template
@@ -1,3 +1,3 @@
 Pkg.UserSrc=false
-#Pkg.Revision=${PLATFORM_SDK_VERSION}.0.0
-Pkg.Revision=24.0.1
+Pkg.Revision=${PLATFORM_SDK_VERSION}.0.0
+

sdk/platform_source.prop_template

diff --git a/sdk/platform_source.prop_template b/sdk/platform_source.prop_template
index 44ace73..5303246 100644
--- a/sdk/platform_source.prop_template
+++ b/sdk/platform_source.prop_template
@@ -2,7 +2,7 @@
 Pkg.UserSrc=false
 Platform.Version=${PLATFORM_VERSION}
 Platform.CodeName=
-Pkg.Revision=2
+Pkg.Revision=1
 AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION}
 #AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME}
 Layoutlib.Api=16