diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-04 13:14:38 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-04 13:14:38 +0000 |
| commit | b7e4b84c3eb441f6f8ab2804d8f71f2b99a05345 (patch) | |
| tree | bee7682b401932290b0a8affa3cc0dc1a12c099b /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 56184dbbc1e2e347a907dd32e3bd4563a88016c0 (diff) | |
| parent | 37a4aeaadfe8d88d9e2ade5c1601fbc49d9c0f47 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: b983b9dfc3 -s ours am: 37a4aeaadf -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1419719
Change-Id: I6b02c30769ffbf3dda9ec3f518632af0a4229b0c
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions