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

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

Browse Source 
Change-Id: I93a460f4ba7c9e2d8e417c53061072773f9ef9fd
This commit is contained in:
Deepanshu Gupta
2014-07-18 15:00:58 -07:00
parent 28b127ec1e 3baef70ca5
commit 6458c80c00
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sdk/platform_source.prop_template
View File

@@ -2,9 +2,9 @@ Pkg.Desc=Android SDK Platform ${PLATFORM_VERSION}
Pkg.UserSrc=false Pkg.UserSrc=false
Platform.Version=${PLATFORM_VERSION} Platform.Version=${PLATFORM_VERSION}
Platform.CodeName=Jelly Bean Platform.CodeName=Jelly Bean
Pkg.Revision=1 Pkg.Revision=5
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