diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-05 14:20:28 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-05 14:20:28 +0000 |
| commit | 2beaafda59c099b3372e1344bd2a99a11686d141 (patch) | |
| tree | bee7682b401932290b0a8affa3cc0dc1a12c099b /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 3ebfd0e7e97f5e4cadeae933d51e518c26091fb1 (diff) | |
| parent | 9e1e819f81f84adb4ae09c691c01a0e530101f20 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 72ad337352 -s ours am: 9e1e819f81 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420420
Change-Id: I24b9a23a31c10ea36c1431081b09c58787cbd845
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions