diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-06 03:55:44 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-06 03:55:44 +0000 |
| commit | 55d8664aa0bc9cdc0e742967f24825f8f3b5cd30 (patch) | |
| tree | 4ff56bde1d82e854b68b88e14125510cd2de0608 /rs/java/android/renderscript/ProgramStore.java | |
| parent | 8409420629bd00be0a2e0c4103340129ef3f6c3a (diff) | |
| parent | 308c7046d3a7216f217db9093115a4270ef37b62 (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: 308c7046d3 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420491
Change-Id: I1becf7e341d9fa3625736499acdb23177da98645
Diffstat (limited to 'rs/java/android/renderscript/ProgramStore.java')
0 files changed, 0 insertions, 0 deletions