am 4362d331: resolved conflicts for merge of 6da9c2ed to klp-ub-dev

* commit '4362d331f0ee5257b881a346fce63348e880fa1c':
  Updating build metadata for march sample push.
This commit is contained in:
Alexander Lucas
2014-03-11 17:44:32 +00:00
committed by Android Git Automerger

View File

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