diff options
author | Jason Hsu <jasonwshsu@google.com> | 2020-08-24 12:20:20 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-24 12:20:20 +0000 |
commit | 8911651789345f6cc657bddea5ed159358ce7635 (patch) | |
tree | 4dbecf6da51152c57f0715330cb75ae8b738ed52 /rs/java/android/renderscript/ProgramStore.java | |
parent | 2104618c584015b5a3f7612a3d1fedcc586e9ccc (diff) | |
parent | a50e74fc84395372dcc3bd45e31bd61985853eb7 (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 skip reason: Change-Id I915e09e4e64d5c268630cec2d0ef05ea0592fd6f with SHA-1 bde40af6ca is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1398278
Change-Id: I675915193a1740624f3bf24d65629848b3828733
Diffstat (limited to 'rs/java/android/renderscript/ProgramStore.java')
0 files changed, 0 insertions, 0 deletions