resolved conflicts for merge of 85074d06 to lmp-dev
Change-Id: I96b3e879893982d9324386336710d8ea11f4796c
This commit is contained in:
@@ -1,4 +1,4 @@
|
|||||||
Pkg.UserSrc=false
|
Pkg.UserSrc=false
|
||||||
Pkg.Revision=1
|
Pkg.Revision=3
|
||||||
AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION}
|
AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION}
|
||||||
AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME}
|
AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME}
|
||||||
|
|||||||
Reference in New Issue
Block a user