diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-03 22:03:43 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-03 22:03:43 +0000 |
| commit | f10f5eb3904c55fa2ca419a276cbc08a2dcec406 (patch) | |
| tree | 5430ad18d04cb520c804f02efe7ded7c8afde45a /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 0fac0c27c83dc92316a8286da8da34f6be13635f (diff) | |
| parent | da8928b7054e7a2c6c1e726bb7818894d34cb36a (diff) | |
Merge "[automerger skipped] Merge "Update language to comply with Android's inclusive language guidance" am: 56f5e6595b am: e7b108a3b5 -s ours" into rvc-dev-plus-aosp am: 4f547ed394 -s ours am: da8928b705 -s ours
am skip reason: Change-Id I971050a2665c177870ff257bd0f41343db702892 with SHA-1 9d7ff99a07 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1380906
Change-Id: Ib217f70780c55828d2705f856af135db53e87710
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions