| commit | 36daa700a0267f4c984553f46163c88b43adc562 | [log] [tgz] |
|---|---|---|
| author | Bob Badour <bbadour@google.com> | Wed Jun 05 20:43:44 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jun 05 20:43:44 2019 -0700 |
| tree | 9f2bf36303d0f794015771586bb21af4e77c65a1 | |
| parent | 415ecb1492e45cdbf6e86d388c58319c13d37911 [diff] | |
| parent | 95736c9fb6fe2b7ce0c9ebdcb62f794aec1e7c41 [diff] |
Merge "Clarify license terms for Romain Guy's artwork." am: 9f56d51018 am: 95736c9fb6 Change-Id: I0531e1cdaf4eacc7dcb032acaa6204df95033526
diff --git a/tests/CanvasCompare/res/drawable/sunset1.jpg b/tests/CanvasCompare/res/drawable/sunset1.jpg index 92851f3..31da357 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 2271091..8b7c6db 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 2271091..8b7c6db 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 92851f3..31da357 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 92851f3..31da357 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 755232d..14d6027 100644 --- a/tests/RenderThreadTest/res/drawable-xhdpi/starry_night_bg.jpg +++ b/tests/RenderThreadTest/res/drawable-xhdpi/starry_night_bg.jpg Binary files differ
