diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-23 12:44:25 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-23 12:44:25 +0000 |
| commit | 0c11a8e45a11d15bd811b1ce1392446c0c891d99 (patch) | |
| tree | d0d14959545074363f2ead642585fc6f74976cb7 /rs/java/android/renderscript/ProgramStore.java | |
| parent | a3d9c37e71233af31141c5ed667c7fae2039a2a3 (diff) | |
| parent | 5e907c31169a73456c2bb7737f14e23c718d69a7 (diff) | |
[automerger skipped] Merge "Update language to comply with Android’s inclusive language guidance" am: 5f7d33da75 am: 5bcf151c30 am: 15c70f85ba am: 96c184e1cf am: 5e907c3116 -s ours
am skip reason: Change-Id I9dc07fa5f087e355d01fbc939749fac2f1f1f554 with SHA-1 d77cc14d74 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1378632
Change-Id: I9db0438656769ddc53f5e643309be2a1185cb18e
Diffstat (limited to 'rs/java/android/renderscript/ProgramStore.java')
0 files changed, 0 insertions, 0 deletions