diff options
author | Bob Badour <bbadour@google.com> | 2019-06-27 17:25:47 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-06-27 17:25:47 -0700 |
commit | 70c6e8bd3faf6078a32b2ad64be2f8e18691f67b (patch) | |
tree | 48dbfee3558b3dd35e40a2ac2ed63b7d7a96755a | |
parent | 6c162a4e363eb0db824f98366f5e8e1115ee52f3 (diff) | |
parent | 9890b01aeece13ef2b0cff5cf7de62514817c8d0 (diff) |
Merge "Clarify license terms for Romain Guy's artwork." am: 2a5ccebc1e
am: 9890b01aee
Change-Id: I47f7e03dbc09f79008b95ddb47d6ab3ca083816f
-rw-r--r-- | tests/HwAccelerationTest/res/drawable-nodpi/very_large_photo.jpg | bin | 1781694 -> 1781132 bytes |
-rw-r--r-- | tests/UiBench/res/drawable-nodpi/frantic.jpg | bin | 192345 -> 191940 bytes |
2 files changed, 0 insertions, 0 deletions
diff --git a/tests/HwAccelerationTest/res/drawable-nodpi/very_large_photo.jpg b/tests/HwAccelerationTest/res/drawable-nodpi/very_large_photo.jpg Binary files differindex 7f047b1098e7..6e1a866dfb00 100644 --- a/tests/HwAccelerationTest/res/drawable-nodpi/very_large_photo.jpg +++ b/tests/HwAccelerationTest/res/drawable-nodpi/very_large_photo.jpg diff --git a/tests/UiBench/res/drawable-nodpi/frantic.jpg b/tests/UiBench/res/drawable-nodpi/frantic.jpg Binary files differindex 4c623336e15b..856b41950d81 100644 --- a/tests/UiBench/res/drawable-nodpi/frantic.jpg +++ b/tests/UiBench/res/drawable-nodpi/frantic.jpg |