diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-01-02 03:59:25 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-02 03:59:25 +0000 |
| commit | 49a17ddcfdc42450fb2886a840fdab2aa6eb1378 (patch) | |
| tree | 6f77117fd424ba1481fa6289e9086f88ff8ac6bb /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 6d37ae9e972eeddc8d8d7d49b160ac09edb7c106 (diff) | |
| parent | 7b26ef1fb624a39b6811e9a92136a3c9d5a94292 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 7b26ef1fb6 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1539149
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I822511f0535631b765c8fce1e131109be2b8415b
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions