diff options
| author | Jason Hsu <jasonwshsu@google.com> | 2020-08-24 12:37:40 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-24 12:37:40 +0000 |
| commit | 7aaa08872dc66458188dc1628da792ebced79c94 (patch) | |
| tree | 88f4779fe1a69571287ed9ceddc30422aaa3cdfc /rs/java/android/renderscript/ProgramStore.java | |
| parent | b434c2945dc0e630f79c47325ed21adf0faadb53 (diff) | |
| parent | 8911651789345f6cc657bddea5ed159358ce7635 (diff) | |
[automerger skipped] Merge "Update language to comply with Android's inclusive language guidance" am: 267cc11642 am: 711a4b4b2d -s ours am: 8ce269efa4 -s ours am: a50e74fc84 -s ours am: 8911651789 -s ours
am skip reason: Change-Id Ibbd97bf31915d59b5110cbcc8f2126f7a7221060 with SHA-1 cfb9bd346c is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1398278
Change-Id: Ifbdcf87a2f88a4338d173ac243eb231948483839
Diffstat (limited to 'rs/java/android/renderscript/ProgramStore.java')
0 files changed, 0 insertions, 0 deletions