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