diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-12-06 16:55:56 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-06 16:55:56 +0000 |
commit | 970aabacc5ea5666e7ea262c63db1e486d1475ba (patch) | |
tree | ba6c3bc9147c41b0b3d62f48824d83f5832ad5cc /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 71c3b827c3fc1ff03a5bcb2b8b0d09007d3717be (diff) | |
parent | b6bec330c2d1d564b31d50460b36ac5834826b00 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 77b40ed1c6 -s ours am: 8fd78a83ee -s ours am: b6bec330c2 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1518032
Change-Id: Ie22ad3dc3466168504d81dfd1ee687bf9ed91107
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions