diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-05 01:18:47 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-05 01:18:47 +0000 |
commit | ba38778241ad098fbbb46906ed25d57ee716729a (patch) | |
tree | d5d8afda55ebbeb886aebc62d0e0bbc6706fac79 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 08be94791d92dc58029d5d4be9152e282f3b777d (diff) | |
parent | f61752a5f4604ae5533a20530cb3677b08c62dda (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 886806c37b -s ours am: 43cb1c966b -s ours am: e539b278ee -s ours am: f61752a5f4 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420250
Change-Id: I9bab73fb1919cd474ae267418aa93665d0cef045
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions