diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-05 14:55:59 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-05 14:55:59 +0000 |
commit | d8bbffa13389982fabeef36b928482b639567150 (patch) | |
tree | c9e5cc728e671a5de21b72d7c756453b05db63ef /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | e34ba8cb4ec010a9ec0f91ffd0185b74eb66669a (diff) | |
parent | 89a0cae9f9009272f592a318d114a9f5b5003c0f (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 8d9e8ba822 -s ours am: 47c1d3f7a8 -s ours am: 89a0cae9f9 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420421
Change-Id: I132a6f34dba181daa0d502c50270a928823978b7
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions