diff options
| author | Alexander Lucas <alexlucas@google.com> | 2014-03-10 15:02:25 -0700 |
|---|---|---|
| committer | Alexander Lucas <alexlucas@google.com> | 2014-03-10 15:02:25 -0700 |
| commit | 4362d331f0ee5257b881a346fce63348e880fa1c (patch) | |
| tree | 91505d714d9aff770434048c0dd9f114945e76fe /samples | |
| parent | 94f80bce07febc80df1372fc84514b51c7b1e8c7 (diff) | |
| parent | 6da9c2edfe49ddd57cb3f4d0f5cf5e9d03e7133d (diff) | |
| download | android_development-4362d331f0ee5257b881a346fce63348e880fa1c.tar.gz android_development-4362d331f0ee5257b881a346fce63348e880fa1c.tar.bz2 android_development-4362d331f0ee5257b881a346fce63348e880fa1c.zip | |
resolved conflicts for merge of 6da9c2ed to klp-ub-dev
Change-Id: I2997c1204ff7aa9728f4df782fefe9d413bfbba7
Diffstat (limited to 'samples')
| -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 3d4fac528..315be08d3 100644 --- a/samples/samples_source.prop_template +++ b/samples/samples_source.prop_template @@ -1,4 +1,4 @@ Pkg.UserSrc=false -Pkg.Revision=3 +Pkg.Revision=4 AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION} AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME} |