diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-12-07 08:13:27 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-07 08:13:27 +0000 |
commit | 300a7b9d8a5991346c776d5d0dcc6cab322ad11a (patch) | |
tree | aea03a1173f40198a3f74c0d959c3767b4246829 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 792df3a32fc347802e16596dff615cee79bd9575 (diff) | |
parent | ed6863d81422a2e4389602b1541ef101dc21ee58 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: ed6863d814 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13176777
Change-Id: I6ed1325dfd78276051b75c48197fc2ab818098fc
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions