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