resolved conflicts for merge of 489fb042 to master

Change-Id: I0e05d4c354053050453bcc1e8f8564758667abc3
2014-09-23 13:52:58 -07:00
parent 40893d9bdb 489fb042ba
commit ea6660e2da
2 changed files with 2 additions and 4 deletions
--- a/sdk/build_tools_source.prop_template
+++ b/sdk/build_tools_source.prop_template
@@ -1,5 +1,3 @@
 Pkg.UserSrc=false
-// due to the codename this resolve to 20 instead of 21, so replace it with hardcoded version for now.
-//Pkg.Revision=${PLATFORM_SDK_VERSION}.0.0
-Pkg.Revision=21.0.0 rc1
+Pkg.Revision=${PLATFORM_SDK_VERSION}.0.0

--- a/sdk/platform_source.prop_template
+++ b/sdk/platform_source.prop_template
@@ -2,7 +2,7 @@ Pkg.Desc=Android SDK Platform ${PLATFORM_VERSION}
 Pkg.UserSrc=false
 Platform.Version=${PLATFORM_VERSION}
 Platform.CodeName=L
-Pkg.Revision=4
+Pkg.Revision=1
 AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION}
 AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME}
 Layoutlib.Api=12