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

* commit 'cd1255d19cf03b6f0d463b48e0ad6eb8b5c57b57':
  Updating build metadata for march sample push.
This commit is contained in:
Alexander Lucas
2014-03-11 19:18:42 +00:00
committed by Android Git Automerger

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}