resolved conflicts for merge of 489fb042 to master

Change-Id: I0e05d4c354053050453bcc1e8f8564758667abc3
This commit is contained in:
Xavier Ducrohet
2014-09-23 13:52:58 -07:00
2 changed files with 2 additions and 4 deletions

View File

@@ -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