tree 76b56856367f9a10af6d42a9de623dcba756f389
parent 217369162b2f33cb9a08902f5fc783d9b783cafc
parent 1d3e694b97b107e6dfbb92395cc041839c4e14b7
author Treehugger Robot <treehugger-gerrit@google.com> 1600120998 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1600120998 +0000

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

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

Change-Id: I6b4bb71859b54fde6a857680e880e3f389b20c74