resolved conflicts for merge of 566a4694 to klp-modular-dev

Change-Id: I04c6c2fdff66e5e82f5f99cc629f9eaa5725ef26
This commit is contained in:
Raphael Moll
2014-08-22 11:26:33 -07:00

View File

@@ -1,4 +1,4 @@
Pkg.UserSrc=false
Pkg.Revision=2
Pkg.Revision=3
AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION}
AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME}