summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Badour <bbadour@google.com>2019-06-05 16:29:02 -0700
committerBob Badour <bbadour@google.com>2019-06-05 23:30:57 +0000
commit9d53a5e9b7eb111ea305b0e5ab61184c8183ffb6 (patch)
tree75f72fec965754653adc9ef235fefc82784c280f
parent0e576fe6393e68c3300ec40777ac97d0e15e6f8e (diff)
downloadbase-9d53a5e9b7eb111ea305b0e5ab61184c8183ffb6.tar.gz
Clarify license terms for Romain Guy's artwork.
As discussed with Romain Guy in the email thread, the Apache 2.0 license applies to the affected .jpg files now and retroactively from the time of import. 'wallpaper_goldengate.jpg' and 'wallpaper_goldengate_scale.jpg' were altered using the exiftool: exiftool -WebStatement=http://www.apache.org/licenses/LICENSE-2.0 Each of the other images was altered using the exiftool: exiftool -URL=http://www.apache.org/licenses/LICENSE-2.0 \ -WebStatement=http://www.apache.org/licenses/LICENSE-2.0 \ -UsageTerms='Apache License Version 2.0' Change-Id: I52a032fc6aa6373d2fb0ea941e041ea72764268c
-rw-r--r--tests/CanvasCompare/res/drawable/sunset1.jpgbin25019 -> 28050 bytes
-rw-r--r--tests/FrameworkPerf/res/drawable-161dpi/wallpaper_goldengate_scale.jpgbin429660 -> 430064 bytes
-rw-r--r--tests/FrameworkPerf/res/drawable-nodpi/wallpaper_goldengate.jpgbin429660 -> 430064 bytes
-rw-r--r--tests/HwAccelerationTest/res/drawable-hdpi/sunset1.jpgbin25019 -> 28050 bytes
-rw-r--r--tests/HwAccelerationTest/res/drawable/sunset1.jpgbin25019 -> 28050 bytes
-rw-r--r--tests/RenderThreadTest/res/drawable-xhdpi/starry_night_bg.jpgbin561519 -> 564084 bytes
6 files changed, 0 insertions, 0 deletions
diff --git a/tests/CanvasCompare/res/drawable/sunset1.jpg b/tests/CanvasCompare/res/drawable/sunset1.jpg
index 92851f3df924..31da3573894f 100644
--- a/tests/CanvasCompare/res/drawable/sunset1.jpg
+++ b/tests/CanvasCompare/res/drawable/sunset1.jpg
Binary files differ
diff --git a/tests/FrameworkPerf/res/drawable-161dpi/wallpaper_goldengate_scale.jpg b/tests/FrameworkPerf/res/drawable-161dpi/wallpaper_goldengate_scale.jpg
index 2271091909bc..8b7c6db267b9 100644
--- a/tests/FrameworkPerf/res/drawable-161dpi/wallpaper_goldengate_scale.jpg
+++ b/tests/FrameworkPerf/res/drawable-161dpi/wallpaper_goldengate_scale.jpg
Binary files differ
diff --git a/tests/FrameworkPerf/res/drawable-nodpi/wallpaper_goldengate.jpg b/tests/FrameworkPerf/res/drawable-nodpi/wallpaper_goldengate.jpg
index 2271091909bc..8b7c6db267b9 100644
--- a/tests/FrameworkPerf/res/drawable-nodpi/wallpaper_goldengate.jpg
+++ b/tests/FrameworkPerf/res/drawable-nodpi/wallpaper_goldengate.jpg
Binary files differ
diff --git a/tests/HwAccelerationTest/res/drawable-hdpi/sunset1.jpg b/tests/HwAccelerationTest/res/drawable-hdpi/sunset1.jpg
index 92851f3df924..31da3573894f 100644
--- a/tests/HwAccelerationTest/res/drawable-hdpi/sunset1.jpg
+++ b/tests/HwAccelerationTest/res/drawable-hdpi/sunset1.jpg
Binary files differ
diff --git a/tests/HwAccelerationTest/res/drawable/sunset1.jpg b/tests/HwAccelerationTest/res/drawable/sunset1.jpg
index 92851f3df924..31da3573894f 100644
--- a/tests/HwAccelerationTest/res/drawable/sunset1.jpg
+++ b/tests/HwAccelerationTest/res/drawable/sunset1.jpg
Binary files differ
diff --git a/tests/RenderThreadTest/res/drawable-xhdpi/starry_night_bg.jpg b/tests/RenderThreadTest/res/drawable-xhdpi/starry_night_bg.jpg
index 755232deea0e..14d6027bf006 100644
--- a/tests/RenderThreadTest/res/drawable-xhdpi/starry_night_bg.jpg
+++ b/tests/RenderThreadTest/res/drawable-xhdpi/starry_night_bg.jpg
Binary files differ