diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-06 03:26:34 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-06 03:26:34 +0000 |
| commit | 308c7046d3a7216f217db9093115a4270ef37b62 (patch) | |
| tree | d5d8afda55ebbeb886aebc62d0e0bbc6706fac79 /rs/java/android/renderscript/ProgramStore.java | |
| parent | 4062a506b7020ace0e687c4e7f03168898a14b94 (diff) | |
| parent | 5d4cad98acbf780d7c6b94df613eb186e3c5d00e (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 43a1b4cac2 -s ours am: 0d0783929a -s ours am: 5c0818d397 -s ours am: 5d4cad98ac -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420491
Change-Id: Ife0f6909e75496d5f80a049c7d222848175dd986
Diffstat (limited to 'rs/java/android/renderscript/ProgramStore.java')
0 files changed, 0 insertions, 0 deletions