diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-04 13:23:56 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-04 13:23:56 +0000 |
| commit | 04f783cd802a5f2ff74c069f9d2a06001adc761f (patch) | |
| tree | c9e5cc728e671a5de21b72d7c756453b05db63ef /rs/java/android/renderscript/ProgramStore.java | |
| parent | 936bf3042f193b44024847614eea04f2ab30d5ef (diff) | |
| parent | 2549c87669df9eadb537d454896e3dae05f50e7d (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 skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1419992
Change-Id: Ia5b4f966b7aac4dcfc53b751e850b7001957e1ba
Diffstat (limited to 'rs/java/android/renderscript/ProgramStore.java')
0 files changed, 0 insertions, 0 deletions