diff options
| author | Sasha Smundak <asmundak@google.com> | 2019-03-19 21:54:31 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-03-19 21:54:31 -0700 |
| commit | 73b2ac6fa1365d87483886bcaf61c5f5d95bb9df (patch) | |
| tree | 37917cfb49d55940d139fc1ea975f6df55e7729e /rs/java/android/renderscript/RenderScript.java | |
| parent | afe043d68151537c9966c5cdd50b579653f65147 (diff) | |
| parent | 21a06f23e6294c09d24544389c9d90884d929eff (diff) | |
[automerger skipped] Merge "Convert tests/**/Android.mk files to Android.bp, part II" am: e1f19a6ef9 am: 3c611bc533
am: 21a06f23e6 -s ours
am skip reason: change_id I886b6536a0ef1c8d21f15ec7ff9fdb9784d5b865 with SHA1 89414e1ed5 is in history
Change-Id: Icb46e2a1eec04013f97d45fc453c5ce4b7a519df
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions