summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/ProgramStore.java
diff options
context:
space:
mode:
authorJason Hsu <jasonwshsu@google.com>2020-08-24 11:29:22 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-08-24 11:29:22 +0000
commit8ce269efa4ac6af473b659cc51a3250a127f545a (patch)
tree7180d5c6b9c0f19a6ffdba1a851e7a86658f6b63 /rs/java/android/renderscript/ProgramStore.java
parentd3bcb99fee2f80151ee28372e060647f17afd980 (diff)
parent711a4b4b2d1a8cc6169c4b579ce7157fbc9c43f8 (diff)
[automerger skipped] Merge "Update language to comply with Android's inclusive language guidance" am: 267cc11642 am: 711a4b4b2d -s ours
am skip reason: Change-Id I499c4574464862f3a1dcea2c6d51813e23ba4b82 with SHA-1 8ea64c4b6a is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1398278 Change-Id: I865cede45f15bb2339e7cf3341caceff2991b8b4
Diffstat (limited to 'rs/java/android/renderscript/ProgramStore.java')
0 files changed, 0 insertions, 0 deletions