diff options
| author | Wilson Wu <wilsonwu@google.com> | 2020-08-26 11:50:56 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-26 11:50:56 +0000 |
| commit | fab16c259f9828edcb8d1b002936ff3964f28e5c (patch) | |
| tree | ff78f8d9fc60e2f7885a6b755e9a973a0b133941 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 7bf9789299da3adf19b6f51f87756dbb09a77b3a (diff) | |
| parent | 35b0a4ae6c312f6d76c6bc1393a239f8e180027a (diff) | |
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Update IMMS to comply with Android's inclusive language guidance" am: d62396372c -s ours am: e4c0dbb8d8 am: d89656e3bf am: e1f053984a am: 35b0a4ae6c -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1398973
Change-Id: Idec1984225a3ff9174ddd7bfda89471c1d1e6e73
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions