tree 5f41853fd7232fa5f90f30efa058bd3e6a07b1c8
parent 9af4f1d3000b9d5e56ac508b76f791563205c230
parent e022945d69a3f31b9fed18c8bff2805d43914231
author Treehugger Robot <treehugger-gerrit@google.com> 1600123468 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1600123468 +0000

Merge "Replace 'whitelist' with 'allowlist'" am: 8ac6819c0e am: 3563eeb4ae am: 1d3e694b97 am: e022945d69

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1427048

Change-Id: I5725049a13c30e122e1f8b5e4e772b7431a4e32d