summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Badour <bbadour@google.com>2019-06-12 03:29:02 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2019-06-12 03:29:02 +0000
commit17b630aa20ca1344725fa9cccc63dfda004a738e (patch)
treefcfa237968610ca2d573cbfc2695498e26bb90f3
parent908b391a9c006af569dfaff08b37f8fdd6c4da89 (diff)
parent005e606935171efbe3197203ebf250197ba5d3c7 (diff)
downloadbase-17b630aa20ca1344725fa9cccc63dfda004a738e.tar.gz
Merge "Clarify license terms for Romain Guy's artwork."android-o-mr1-iot-release-1.0.14ndk-sysroot-r21
-rw-r--r--build-system/integration-test/test-projects/ndkRsHelloCompute/src/main/res/drawable/data.jpgbin76367 -> 76771 bytes
-rw-r--r--build-system/integration-test/test-projects/renderscript/src/main/res/drawable/data.jpgbin76367 -> 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
index 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
Binary files differ
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
index 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
Binary files differ