tree 89177084c64b9eb838f81f65345585920c26d135
parent 9aa778a081d4d45aed6091c6a2dbd706e4fc93d0
parent 45b3822a3cf98ab85dbcb5abcfef45760129a45b
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1596489967 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1596489967 +0000

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