diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-12-06 16:57:42 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-06 16:57:42 +0000 |
| commit | 6c34f640b9d836af0eb58465087c858b9c682cc2 (patch) | |
| tree | ba6c3bc9147c41b0b3d62f48824d83f5832ad5cc /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | e710d32c8ae15c86470b0cceb43c2608240a7fea (diff) | |
| parent | 8caaa711c6399e97b7fde0407a546fd46c536dc8 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: c110ac2338 -s ours am: 8caaa711c6 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13175748
Change-Id: I13c34ea454e4c64c20c22c42a227ab39008a0e8d
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions