diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-04 14:07:33 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-04 14:07:33 +0000 |
commit | d1e6339426ea658b020fb350a37c276ea556535b (patch) | |
tree | 8319687fc73911705cea79427cc774ec5d2677cc /rs/java/android/renderscript/ProgramStore.java | |
parent | 5136856d3aa5bcc269ed3dc0df4c8b3c96af3aff (diff) | |
parent | 1c7f26b45d1af6862abbd8e7ba4691d952c4ae66 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 4a703c2a7c -s ours am: f4ea890b6e -s ours am: 56184dbbc1 -s ours am: 593f36d311 -s ours am: 1c7f26b45d -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1419722
Change-Id: I3565b4536863608f43128eca2890c9e3670d4d30
Diffstat (limited to 'rs/java/android/renderscript/ProgramStore.java')
0 files changed, 0 insertions, 0 deletions