diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-01-02 22:54:56 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-02 22:54:56 +0000 |
| commit | 956490c5222576fe7d1d9a092b72e5c411e963be (patch) | |
| tree | 67a919d4e86aedd38f002aabb2a2f1b3bddfbab5 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | b53531fddc9baf485c7bc2a1c14d776e6c00216a (diff) | |
| parent | 45edcd06e91848af2253463b7f8addcf0436fb81 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 4c17cd1260 -s ours am: 45edcd06e9 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13281613
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib0250942eb91b0d19c9a61a0fd6e9de02ad63648
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions