resolved conflicts for merge of d9273517 to lmp-mr1-wfc-dev

Change-Id: I1fb8204003e0d69fcca2013a63523ceb33069d5b
This commit is contained in:
Xavier Ducrohet
2015-03-03 09:46:10 -08:00

View File

@@ -1,3 +1,3 @@
Pkg.UserSrc=false
Pkg.Revision=${PLATFORM_SDK_VERSION}.1.2
Pkg.Revision=${PLATFORM_SDK_VERSION}.0.0