resolved conflicts for merge of 6458c80c to jb-mr1.1-docs
Change-Id: I8b4d344b4cf0004b377e0e9b08f3bbaf0a7641f0
This commit is contained in:
@@ -5,6 +5,6 @@ Platform.CodeName=Jelly Bean
|
||||
Pkg.Revision=2
|
||||
AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION}
|
||||
AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME}
|
||||
Layoutlib.Api=9
|
||||
Layoutlib.Api=12
|
||||
Layoutlib.Revision=1
|
||||
Platform.MinToolsRev=21
|
||||
|
||||
Reference in New Issue
Block a user