diff options
| author | Wilson Wu <wilsonwu@google.com> | 2020-08-26 11:36:12 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-26 11:36:12 +0000 |
| commit | 35b0a4ae6c312f6d76c6bc1393a239f8e180027a (patch) | |
| tree | 5fc20999d1b6c84e89b82a823eee79096aca58b0 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 7bc92e16d9e16fd17d7be3e2268ec9400bfcd191 (diff) | |
| parent | e1f053984ab05d6c07ecca38820a746ea28d9729 (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
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1398973
Change-Id: I54b16fa79369e5a6fb097d831e6e5e23e2fd8a38
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions