diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-03 21:50:57 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-03 21:50:57 +0000 |
| commit | da8928b7054e7a2c6c1e726bb7818894d34cb36a (patch) | |
| tree | a9a6c51d37b333ae704f29364d9bb157f109c186 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | b8582d6392f4f50a2864cea3479a1eb261772e7b (diff) | |
| parent | 4f547ed394072816927c8f0dda6dc118c9904ce7 (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 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: I0f2f489b8b6cddfbf86838e0acf48857fe740a6f
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions