| commit | 2ebbd9c932a80710fc7eaec6ced3a13f0b72888e | [log] [tgz] |
|---|---|---|
| author | Bob Badour <bbadour@google.com> | Tue Jun 11 09:32:33 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jun 11 09:32:33 2019 -0700 |
| tree | e0c4007d576b0574dfee97e6a5becf2e57d45b99 | |
| parent | 69c4b95102b4b9862bfba68b3eaf5b7537a705ee [diff] | |
| parent | 616a4bd404156d6a1ce8a368202cb04916007e6b [diff] |
Merge "Clarify license terms for Romain Guy's artwork." am: dbc4a43cd9 am: d99cce0a4e am: defbc032e6 am: 616a4bd404 Change-Id: I9e2fe8cf186ff628fbfec255a583a519fb1d3277
diff --git a/tests/ndkRsHelloCompute/src/main/res/drawable/data.jpg b/tests/ndkRsHelloCompute/src/main/res/drawable/data.jpg index 81a87b1..b7a0cbd 100644 --- a/tests/ndkRsHelloCompute/src/main/res/drawable/data.jpg +++ b/tests/ndkRsHelloCompute/src/main/res/drawable/data.jpg Binary files differ
diff --git a/tests/renderscript/src/main/res/drawable/data.jpg b/tests/renderscript/src/main/res/drawable/data.jpg index 81a87b1..b7a0cbd 100644 --- a/tests/renderscript/src/main/res/drawable/data.jpg +++ b/tests/renderscript/src/main/res/drawable/data.jpg Binary files differ
