am 18ec7c4f: resolved conflicts for merge of 566a4694 to klp-modular-dev

* commit '18ec7c4f8a8d1780fa80f0ab21e484576c775fe4':
  Update sdk_repo samples 19 rev from 5 to 6. DO NOT MERGE.
This commit is contained in:
Raphael Moll
2014-08-22 18:44:54 +00:00
committed by Android Git Automerger

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}