diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-05 05:27:11 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-05 05:27:11 +0000 |
| commit | b8da09b3969179e7eff7292a89271b7b8890b1ec (patch) | |
| tree | bee7682b401932290b0a8affa3cc0dc1a12c099b /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | eb4a9ae37b5785bc5863851a6218350c8ef26bb4 (diff) | |
| parent | a49c29bd171974a7c838d1ceb3ab76cbada46fff (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 39695933e7 -s ours am: a49c29bd17 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420258
Change-Id: Ia3a4274b5f58ca7d63cf1f59b1fd0d180cd310fa
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions