diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-04 07:48:15 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-04 07:48:15 +0000 |
commit | 47d8fdb784fdbb509ae01fa62ad6684eba78463b (patch) | |
tree | d2816b6e2b056a8f75c9e01b760efb6909853514 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | c52327b7149b047deb018ac1a2fae1851051d656 (diff) | |
parent | 063c5052f8cd796cf3e8cabff664231a62ce75ed (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: ec08343fc5 -s ours am: 063c5052f8 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1419990
Change-Id: Ibfbc16d4c6bf782a8bce86fd5dccb9d43820c6d2
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions