diff options
author | Wilson Wu <wilsonwu@google.com> | 2020-08-26 10:58:59 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-26 10:58:59 +0000 |
commit | e1f053984ab05d6c07ecca38820a746ea28d9729 (patch) | |
tree | dcf46365967896048018cb782de830365610303f /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 66bad21b876633b20d45fbe6972367723e22aa5e (diff) | |
parent | d89656e3bfd6cfbd3027061a13405f3543220db4 (diff) |
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Update IMMS to comply with Android's inclusive language guidance" am: d62396372c -s ours am: e4c0dbb8d8 am: d89656e3bf
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1398973
Change-Id: I744e07a163b09a22ad2135362da1a4f3058f7e02
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions