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

Browse Source

am: 0e3bcf70c5

Change-Id: I41aa58ddb9a21ff4c8278e251af34a89783f60ae

...

This commit is contained in:

Bob Badour

2019-06-05 14:47:56 -07:00

committed by android-build-merger

parent 5260d9aa63 0e3bcf70c5

commit bcd745dddc

7 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

samples/ApiDemos/res/drawable/photo6.jpg

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 43 KiB After Width:  |  Height:  |  Size: 44 KiB

BIN

samples/Home/res/drawable-land/bg_sunset.jpg

Binary file not shown.

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

BIN

samples/Home/res/drawable-land/bg_sunset_icon.jpg

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.2 KiB After Width:  |  Height:  |  Size: 4.6 KiB

BIN

samples/Home/res/drawable-port/bg_sunset.jpg

Binary file not shown.

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

BIN

samples/Home/res/drawable-port/bg_sunset_icon.jpg

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.6 KiB After Width:  |  Height:  |  Size: 4.0 KiB

BIN

samples/RenderScript/HelloCompute/res/drawable/data.jpg

Binary file not shown.

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

BIN

samples/browseable/BasicRenderScript/res/drawable-nodpi/data.jpg

Binary file not shown.

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