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