diff options
author | Bob Badour <bbadour@google.com> | 2019-06-11 09:17:24 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-06-11 09:17:24 -0700 |
commit | d99cce0a4e9c15429974cac6be5ffb7e00842c6f (patch) | |
tree | e0c4007d576b0574dfee97e6a5becf2e57d45b99 | |
parent | 69c4b95102b4b9862bfba68b3eaf5b7537a705ee (diff) | |
parent | dbc4a43cd97e5d43a2f2d0a867239d88c212e149 (diff) | |
download | build-d99cce0a4e9c15429974cac6be5ffb7e00842c6f.tar.gz |
Merge "Clarify license terms for Romain Guy's artwork."
am: dbc4a43cd9
Change-Id: Ib51fe2f832b19c7789e844eba4a7d20a73db305e
-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 |