diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-05 05:49:31 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-05 05:49:31 +0000 |
| commit | 06d951ea4e8453982b0d065a5d906570ba778f63 (patch) | |
| tree | d5d8afda55ebbeb886aebc62d0e0bbc6706fac79 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | e30890a402e963de7b7fd380e8d8536efbeb4ee8 (diff) | |
| parent | 6784db4ef630878360d8848041f35d6a1c172787 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 740f9a6a91 -s ours am: e3738078e9 -s ours am: 932108123a -s ours am: 6784db4ef6 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420255
Change-Id: I61d18135523381bf7696d552ecfb10b9444c9a4d
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions