resolved conflicts for merge of a244c58a to master
Change-Id: I26b889dc4bcf5cf1c7923757b362a8f448734c31
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
Pkg.UserSrc=false
|
||||
Pkg.Revision=${PLATFORM_SDK_VERSION}.0.1
|
||||
Pkg.Revision=${PLATFORM_SDK_VERSION}.0.0
|
||||
Extra.Vendor=android
|
||||
Extra.VendorId=android
|
||||
Extra.VendorDisplay=Android
|
||||
|
||||
Reference in New Issue
Block a user