Merge "Clarify license terms for Romain Guy's artwork."

Browse Source

am: 2a5ccebc1e

Change-Id: I99502320bb087370796fc8f23500f1b82b070cbe

...

This commit is contained in:

Bob Badour

2019-06-27 17:02:20 -07:00

committed by android-build-merger

parent f5ee9c61be 2a5ccebc1e

commit 9890b01aee

2 changed files with 0 additions and 0 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

tests/HwAccelerationTest/res/drawable-nodpi/very_large_photo.jpg

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.7 MiB After Width:  |  Height:  |  Size: 1.7 MiB

BIN

tests/UiBench/res/drawable-nodpi/frantic.jpg

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 188 KiB After Width:  |  Height:  |  Size: 187 KiB