diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-10-05 13:50:11 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-10-05 13:50:11 +0000 |
commit | 77a9e8ad331f638c9df4e64cbb701134e522db1f (patch) | |
tree | 769122f58f1f3bce7d43ef27e3b1ce8e65ec4293 /rs/java/android/renderscript/ProgramStore.java | |
parent | 2fe07d3a1f83ccb708a56cbd057ef794df92d58d (diff) | |
parent | 3abb35122161c539a63d42a129afbb490652ab86 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 7e335c887e -s ours am: 9aee32dba9 -s ours am: 3abb351221 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12759559
Change-Id: If06abffde6a52b16f9fee3cb42fe439623e0557b
Diffstat (limited to 'rs/java/android/renderscript/ProgramStore.java')
0 files changed, 0 insertions, 0 deletions