diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-04 14:07:01 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-04 14:07:01 +0000 |
| commit | 5136856d3aa5bcc269ed3dc0df4c8b3c96af3aff (patch) | |
| tree | 8319687fc73911705cea79427cc774ec5d2677cc /rs/java/android/renderscript/ProgramStore.java | |
| parent | ba5a56e80f73ef304e144d8fdde70e217115d69c (diff) | |
| parent | 302fb6266f2c66b4eeb784b202794c145d88f443 (diff) | |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: e18dc3c379 -s ours am: 70c9ae224c -s ours" into rvc-dev-plus-aosp am: 2549c87669 -s ours am: 04f783cd80 -s ours am: 302fb6266f -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1419992
Change-Id: Ib2d270c33c9d2b0d1d6d40c8b1f252b537b107c5
Diffstat (limited to 'rs/java/android/renderscript/ProgramStore.java')
0 files changed, 0 insertions, 0 deletions