diff options
| author | Bob Badour <bbadour@google.com> | 2019-06-05 20:40:03 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-06-05 20:40:03 -0700 |
| commit | 95736c9fb6fe2b7ce0c9ebdcb62f794aec1e7c41 (patch) | |
| tree | 75f72fec965754653adc9ef235fefc82784c280f | |
| parent | 2a0f679a78e031eeaa9bdd593a4b5bfbf33b6967 (diff) | |
| parent | 9f56d5101830c28d97d58b486e8e71225422c3fa (diff) | |
| download | base-95736c9fb6fe2b7ce0c9ebdcb62f794aec1e7c41.tar.gz | |
Merge "Clarify license terms for Romain Guy's artwork."
am: 9f56d51018
Change-Id: I9bbe74a2151bf959febcf3d7b5c2b48ef8afd8c3
| -rw-r--r-- | tests/CanvasCompare/res/drawable/sunset1.jpg | bin | 25019 -> 28050 bytes |
| -rw-r--r-- | tests/FrameworkPerf/res/drawable-161dpi/wallpaper_goldengate_scale.jpg | bin | 429660 -> 430064 bytes |
| -rw-r--r-- | tests/FrameworkPerf/res/drawable-nodpi/wallpaper_goldengate.jpg | bin | 429660 -> 430064 bytes |
| -rw-r--r-- | tests/HwAccelerationTest/res/drawable-hdpi/sunset1.jpg | bin | 25019 -> 28050 bytes |
| -rw-r--r-- | tests/HwAccelerationTest/res/drawable/sunset1.jpg | bin | 25019 -> 28050 bytes |
| -rw-r--r-- | tests/RenderThreadTest/res/drawable-xhdpi/starry_night_bg.jpg | bin | 561519 -> 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 Binary files differindex 92851f3df924..31da3573894f 100644 --- a/tests/CanvasCompare/res/drawable/sunset1.jpg +++ b/tests/CanvasCompare/res/drawable/sunset1.jpg diff --git a/tests/FrameworkPerf/res/drawable-161dpi/wallpaper_goldengate_scale.jpg b/tests/FrameworkPerf/res/drawable-161dpi/wallpaper_goldengate_scale.jpg Binary files differindex 2271091909bc..8b7c6db267b9 100644 --- a/tests/FrameworkPerf/res/drawable-161dpi/wallpaper_goldengate_scale.jpg +++ b/tests/FrameworkPerf/res/drawable-161dpi/wallpaper_goldengate_scale.jpg diff --git a/tests/FrameworkPerf/res/drawable-nodpi/wallpaper_goldengate.jpg b/tests/FrameworkPerf/res/drawable-nodpi/wallpaper_goldengate.jpg Binary files differindex 2271091909bc..8b7c6db267b9 100644 --- a/tests/FrameworkPerf/res/drawable-nodpi/wallpaper_goldengate.jpg +++ b/tests/FrameworkPerf/res/drawable-nodpi/wallpaper_goldengate.jpg diff --git a/tests/HwAccelerationTest/res/drawable-hdpi/sunset1.jpg b/tests/HwAccelerationTest/res/drawable-hdpi/sunset1.jpg Binary files differindex 92851f3df924..31da3573894f 100644 --- a/tests/HwAccelerationTest/res/drawable-hdpi/sunset1.jpg +++ b/tests/HwAccelerationTest/res/drawable-hdpi/sunset1.jpg diff --git a/tests/HwAccelerationTest/res/drawable/sunset1.jpg b/tests/HwAccelerationTest/res/drawable/sunset1.jpg Binary files differindex 92851f3df924..31da3573894f 100644 --- a/tests/HwAccelerationTest/res/drawable/sunset1.jpg +++ b/tests/HwAccelerationTest/res/drawable/sunset1.jpg diff --git a/tests/RenderThreadTest/res/drawable-xhdpi/starry_night_bg.jpg b/tests/RenderThreadTest/res/drawable-xhdpi/starry_night_bg.jpg Binary files differindex 755232deea0e..14d6027bf006 100644 --- a/tests/RenderThreadTest/res/drawable-xhdpi/starry_night_bg.jpg +++ b/tests/RenderThreadTest/res/drawable-xhdpi/starry_night_bg.jpg |
