am 062a470e: am 1bdf0eee: Merge "DO NOT MERGE Increase the system-image revision number after opengl bug fix" into mnc-dev
* commit '062a470eed4cb98f2505d7dd00736a956f7dd540': DO NOT MERGE Increase the system-image revision number after opengl bug fix
This commit is contained in:
committed by
Android Git Automerger
commit
80417a1fb9
@@ -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=3
|
||||||
AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION}
|
AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION}
|
||||||
AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME}
|
AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME}
|
||||||
SystemImage.Abi=${TARGET_CPU_ABI}
|
SystemImage.Abi=${TARGET_CPU_ABI}
|
||||||
|
|||||||
@@ -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=3
|
||||||
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
|
||||||
|
|||||||
@@ -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=3
|
||||||
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
|
||||||
|
|||||||
@@ -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=3
|
||||||
AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION}
|
AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION}
|
||||||
AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME}
|
AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME}
|
||||||
SystemImage.Abi=mips64
|
SystemImage.Abi=mips64
|
||||||
|
|||||||
@@ -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=3
|
||||||
AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION}
|
AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION}
|
||||||
AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME}
|
AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME}
|
||||||
SystemImage.Abi=mips
|
SystemImage.Abi=mips
|
||||||
|
|||||||
@@ -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=3
|
||||||
AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION}
|
AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION}
|
||||||
AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME}
|
AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME}
|
||||||
SystemImage.Abi=${TARGET_CPU_ABI}
|
SystemImage.Abi=${TARGET_CPU_ABI}
|
||||||
|
|||||||
@@ -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=3
|
||||||
AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION}
|
AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION}
|
||||||
AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME}
|
AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME}
|
||||||
SystemImage.Abi=${TARGET_CPU_ABI}
|
SystemImage.Abi=${TARGET_CPU_ABI}
|
||||||
|
|||||||
Reference in New Issue
Block a user