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

resolve merge conflicts of 5e972519 to jb-mr1.1-docs

Browse Source 
Change-Id: Ie5af5f01ead4d29cf84d2951606ddcd9f95a5b70
This commit is contained in:
Nick Kralevich
2015-08-08 07:38:47 -07:00
parent e2ee1baff8 5e9725191f
commit 8e4ac6bd72
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sdk/images_armeabi-v7a_source.prop_template
View File

@@ -1,6 +1,6 @@
Pkg.Desc=Android SDK Platform ${PLATFORM_VERSION} Pkg.Desc=Android SDK Platform ${PLATFORM_VERSION}
Pkg.UserSrc=false Pkg.UserSrc=false
Pkg.Revision=2 Pkg.Revision=4
AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION} AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION}
AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME} AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME}
SystemImage.Abi=armeabi-v7a SystemImage.Abi=armeabi-v7a

2
sdk/images_armeabi_source.prop_template
View File

@@ -1,6 +1,6 @@
Pkg.Desc=Android SDK Platform ${PLATFORM_VERSION} Pkg.Desc=Android SDK Platform ${PLATFORM_VERSION}
Pkg.UserSrc=false Pkg.UserSrc=false
Pkg.Revision=1 Pkg.Revision=2
AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION} AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION}
AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME} AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME}
SystemImage.Abi=armeabi SystemImage.Abi=armeabi

2
sdk/images_x86_source.prop_template
View File

@@ -1,6 +1,6 @@
Pkg.Desc=Android SDK Platform ${PLATFORM_VERSION} Pkg.Desc=Android SDK Platform ${PLATFORM_VERSION}
Pkg.UserSrc=false Pkg.UserSrc=false
Pkg.Revision=1 Pkg.Revision=2
AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION} AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION}
AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME} AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME}
SystemImage.Abi=x86 SystemImage.Abi=x86