diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-05 01:19:30 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-05 01:19:30 +0000 |
commit | 7e59631036a63a0fba81d943699984a44fdf9f47 (patch) | |
tree | d5d8afda55ebbeb886aebc62d0e0bbc6706fac79 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | ba38778241ad098fbbb46906ed25d57ee716729a (diff) | |
parent | d1ed3db8a0e64384713982171ecca475924316ac (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 59abb4f816 -s ours am: 93fb60e626 -s ours am: 5481fa7837 -s ours am: d1ed3db8a0 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420249
Change-Id: Ic451d8b6032cc452ed92be3fd2a2305021df3aeb
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions