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