diff options
| author | Bob Badour <bbadour@google.com> | 2019-06-11 21:10:54 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-06-11 21:10:54 -0700 |
| commit | 2f03004c181baf9d291a9bf992e1b444e83cd82d (patch) | |
| tree | fcfa237968610ca2d573cbfc2695498e26bb90f3 | |
| parent | 908b391a9c006af569dfaff08b37f8fdd6c4da89 (diff) | |
| parent | 3d291a68463df7fb875a08f12cc39761a8e351f0 (diff) | |
| download | base-2f03004c181baf9d291a9bf992e1b444e83cd82d.tar.gz | |
Merge "Clarify license terms for Romain Guy's artwork." am: 17b630aa20 am: ace7e51e19android-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: 3d291a6846
Change-Id: I46f9f39a91a62fc7f16313b156256de9e3963c32
| -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 |
