diff options
| author | Bob Badour <bbadour@google.com> | 2019-06-05 20:43:44 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-06-05 20:43:44 -0700 |
| commit | 36daa700a0267f4c984553f46163c88b43adc562 (patch) | |
| tree | 9f2bf36303d0f794015771586bb21af4e77c65a1 | |
| parent | 415ecb1492e45cdbf6e86d388c58319c13d37911 (diff) | |
| parent | 95736c9fb6fe2b7ce0c9ebdcb62f794aec1e7c41 (diff) | |
Merge "Clarify license terms for Romain Guy's artwork." am: 9f56d51018
am: 95736c9fb6
Change-Id: I0531e1cdaf4eacc7dcb032acaa6204df95033526
| -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 |
