diff options
| author | Bob Badour <bbadour@google.com> | 2019-06-11 20:55:55 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-06-11 20:55:55 -0700 |
| commit | ace7e51e19dd8e70033232c990127de932c96b56 (patch) | |
| tree | fcfa237968610ca2d573cbfc2695498e26bb90f3 | |
| parent | 908b391a9c006af569dfaff08b37f8fdd6c4da89 (diff) | |
| parent | 17b630aa20ca1344725fa9cccc63dfda004a738e (diff) | |
| download | base-ace7e51e19dd8e70033232c990127de932c96b56.tar.gz | |
Merge "Clarify license terms for Romain Guy's artwork."
am: 17b630aa20
Change-Id: If97c3f85184886cc6b0be345db23eaa213a240ed
| -rw-r--r-- | build-system/integration-test/test-projects/ndkRsHelloCompute/src/main/res/drawable/data.jpg | bin | 76367 -> 76771 bytes |
| -rw-r--r-- | build-system/integration-test/test-projects/renderscript/src/main/res/drawable/data.jpg | bin | 76367 -> 76771 bytes |
2 files changed, 0 insertions, 0 deletions
diff --git a/build-system/integration-test/test-projects/ndkRsHelloCompute/src/main/res/drawable/data.jpg b/build-system/integration-test/test-projects/ndkRsHelloCompute/src/main/res/drawable/data.jpg Binary files differindex 81a87b1726..b7a0cbd39d 100644 --- a/build-system/integration-test/test-projects/ndkRsHelloCompute/src/main/res/drawable/data.jpg +++ b/build-system/integration-test/test-projects/ndkRsHelloCompute/src/main/res/drawable/data.jpg diff --git a/build-system/integration-test/test-projects/renderscript/src/main/res/drawable/data.jpg b/build-system/integration-test/test-projects/renderscript/src/main/res/drawable/data.jpg Binary files differindex 81a87b1726..b7a0cbd39d 100644 --- a/build-system/integration-test/test-projects/renderscript/src/main/res/drawable/data.jpg +++ b/build-system/integration-test/test-projects/renderscript/src/main/res/drawable/data.jpg |
