diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-04 08:19:07 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-04 08:19:07 +0000 |
| commit | 97714cd3529601ff5d0721795e46c2ba4d6743f1 (patch) | |
| tree | faa2874e67fc4d971e2d00a7a5515aa1f0596076 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | ae9e6f1ae4bd169183ae5c0229196a55fe9c853d (diff) | |
| parent | c8581eab83c79de9e919b23fa26370b2e62ef8a1 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 21952d24d6 -s ours am: 0d6d7a7495 -s ours am: c8581eab83 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1419989
Change-Id: I38a2ea7afa4c7304e774ee09ad0838c406efd919
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions