LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

resolved conflicts for merge of 6458c80c to jb-mr1.1-docs

Browse Source 
Change-Id: I8b4d344b4cf0004b377e0e9b08f3bbaf0a7641f0
This commit is contained in:
Deepanshu Gupta
2014-07-18 15:17:44 -07:00
parent 392804d01c 6458c80c00
commit e2ee1baff8
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sdk/platform_source.prop_template
View File

@@ -5,6 +5,6 @@ Platform.CodeName=Jelly Bean
Pkg.Revision=2 Pkg.Revision=2
AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION} AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION}
AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME} AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME}
Layoutlib.Api=9 Layoutlib.Api=12
Layoutlib.Revision=1 Layoutlib.Revision=1
Platform.MinToolsRev=21 Platform.MinToolsRev=21