diff options
| author | Raphael Moll <raphael@google.com> | 2014-08-22 11:26:33 -0700 |
|---|---|---|
| committer | Raphael Moll <raphael@google.com> | 2014-08-22 11:26:33 -0700 |
| commit | 18ec7c4f8a8d1780fa80f0ab21e484576c775fe4 (patch) | |
| tree | ca3b9770cac2aaabee7979994b6dbf96a24f9bc4 /samples/samples_source.prop_template | |
| parent | d97ecae3db7b06238e215f6cde15b1bfee658a02 (diff) | |
| parent | 566a46941e4b473fb4fd2e74a18b7453ebad1625 (diff) | |
| download | android_development-18ec7c4f8a8d1780fa80f0ab21e484576c775fe4.tar.gz android_development-18ec7c4f8a8d1780fa80f0ab21e484576c775fe4.tar.bz2 android_development-18ec7c4f8a8d1780fa80f0ab21e484576c775fe4.zip | |
resolved conflicts for merge of 566a4694 to klp-modular-dev
Change-Id: I04c6c2fdff66e5e82f5f99cc629f9eaa5725ef26
Diffstat (limited to 'samples/samples_source.prop_template')
| -rw-r--r-- | samples/samples_source.prop_template | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/samples/samples_source.prop_template b/samples/samples_source.prop_template index 523d6bda8..3d4fac528 100644 --- a/samples/samples_source.prop_template +++ b/samples/samples_source.prop_template @@ -1,4 +1,4 @@ Pkg.UserSrc=false -Pkg.Revision=2 +Pkg.Revision=3 AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION} AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME} |