| commit | 1c5bb26db02e0eafa3d44a94fad0a9508cd3102b | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Tue Sep 15 20:56:15 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Sep 15 20:56:15 2020 +0000 |
| tree | 52a958fb14c26638ee549c0f14ccbe2c673d71bf | |
| parent | 4c2a7b1dfed6c77bd826a35fd70f170fd92eae11 [diff] | |
| parent | bc93881957cd39e810aa67bea67ffe6a67da9c2a [diff] |
[automerger skipped] Merge "Replace 'whitelist' with 'allowlist'" am: 8ac6819c0e am: 3563eeb4ae am: 1d3e694b97 am: e022945d69 am: bc93881957 -s ours am skip reason: Change-Id I94a43c1c995052b034d8a5377786e1a15e4c9c59 with SHA-1 0d3caed705 is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1427048 Change-Id: Ic7b5df8b6102f2738c5e0f34a22efd20e7fc5958