resolved conflicts for merge of 6da9c2ed to klp-ub-dev

Change-Id: I2997c1204ff7aa9728f4df782fefe9d413bfbba7
This commit is contained in:
Alexander Lucas
2014-03-10 15:02:25 -07:00

View File

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