resolved conflicts for merge of 3baef70c to jb-mr1-dev

Change-Id: I93a460f4ba7c9e2d8e417c53061072773f9ef9fd
2014-07-18 15:00:58 -07:00
parent 28b127ec1e 3baef70ca5
commit 6458c80c00
1 changed files with 2 additions and 2 deletions
--- a/sdk/platform_source.prop_template
+++ b/sdk/platform_source.prop_template
@@ -2,9 +2,9 @@ Pkg.Desc=Android SDK Platform ${PLATFORM_VERSION}
 Pkg.UserSrc=false
 Platform.Version=${PLATFORM_VERSION}
 Platform.CodeName=Jelly Bean
-Pkg.Revision=1
+Pkg.Revision=5
 AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION}
 AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME}
-Layoutlib.Api=9
+Layoutlib.Api=12
 Layoutlib.Revision=1
 Platform.MinToolsRev=21