diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-01-02 08:43:31 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-02 08:43:31 +0000 |
| commit | 952d1314830bd2d8519159bddf42ae3121fc12de (patch) | |
| tree | 67a919d4e86aedd38f002aabb2a2f1b3bddfbab5 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 42c619b563d646ee64b1b1eb1ea3cc8b809884b9 (diff) | |
| parent | e8bd87c530e8f0a5e563e528974d721ef2cd781b (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: fd89d91847 -s ours am: da33eadd10 -s ours am: e8bd87c530 -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: Iee21fd430b66c73fc05e6a1382b583ad008a33be
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions