diff options
| author | Bob Badour <bbadour@google.com> | 2019-06-11 09:27:32 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-06-11 09:27:32 -0700 |
| commit | 616a4bd404156d6a1ce8a368202cb04916007e6b (patch) | |
| tree | e0c4007d576b0574dfee97e6a5becf2e57d45b99 | |
| parent | 69c4b95102b4b9862bfba68b3eaf5b7537a705ee (diff) | |
| parent | defbc032e69d262df78ddb16102bea9023aeb207 (diff) | |
| download | build-616a4bd404156d6a1ce8a368202cb04916007e6b.tar.gz | |
Merge "Clarify license terms for Romain Guy's artwork." am: dbc4a43cd9 am: d99cce0a4eandroid-r-preview-4android-r-preview-3android-r-preview-2android-r-preview-1android-r-beta-3android-r-beta-2android-mainline-10.0.0_r8android-mainline-10.0.0_r6android10-mainline-resolv-releaseandroid10-mainline-networking-release
am: defbc032e6
Change-Id: I0dac219509ce76b5a67024a000e3e47a352472c3
| -rw-r--r-- | tests/ndkRsHelloCompute/src/main/res/drawable/data.jpg | bin | 76367 -> 76771 bytes |
| -rw-r--r-- | tests/renderscript/src/main/res/drawable/data.jpg | bin | 76367 -> 76771 bytes |
2 files changed, 0 insertions, 0 deletions
diff --git a/tests/ndkRsHelloCompute/src/main/res/drawable/data.jpg b/tests/ndkRsHelloCompute/src/main/res/drawable/data.jpg Binary files differindex 81a87b1..b7a0cbd 100644 --- a/tests/ndkRsHelloCompute/src/main/res/drawable/data.jpg +++ b/tests/ndkRsHelloCompute/src/main/res/drawable/data.jpg diff --git a/tests/renderscript/src/main/res/drawable/data.jpg b/tests/renderscript/src/main/res/drawable/data.jpg Binary files differindex 81a87b1..b7a0cbd 100644 --- a/tests/renderscript/src/main/res/drawable/data.jpg +++ b/tests/renderscript/src/main/res/drawable/data.jpg |
