am 26c34d44: resolved conflicts for merge of 85074d06 to lmp-dev

* commit '26c34d447d7bcf0e05b560d02320b7cb22dab06c':
  Update sdk_repo samples 19 rev from 5 to 6. DO NOT MERGE.
This commit is contained in:
Raphael Moll
2014-08-26 04:57:01 +00:00
committed by Android Git Automerger

View File

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