| commit | e5707a5b9fc46b6ea63eeece879fb996bde27e75 | [log] [tgz] |
|---|---|---|
| author | Bob Badour <bbadour@google.com> | Tue Jun 11 21:17:29 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jun 11 21:17:29 2019 -0700 |
| tree | fcfa237968610ca2d573cbfc2695498e26bb90f3 | |
| parent | 908b391a9c006af569dfaff08b37f8fdd6c4da89 [diff] | |
| parent | 2f03004c181baf9d291a9bf992e1b444e83cd82d [diff] |
Merge "Clarify license terms for Romain Guy's artwork." am: 17b630aa20 am: ace7e51e19 am: 3d291a6846 am: 2f03004c18 Change-Id: I1eca7f36b9c0aa7038931799ec4b071929ce768d
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 81a87b1..b7a0cbd 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 81a87b1..b7a0cbd 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
