commit | 804799ae8a83535f9219145d9d41f3a6a0101b62 | [log] [tgz] |
---|---|---|
author | Dave Mankoff <mankoff@google.com> | Tue Aug 10 19:31:18 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 10 19:31:18 2021 +0000 |
tree | aad7307ab2b58c058c6cc74ed0202eb614e35e48 | |
parent | 5a382b69154665e5c67f8869a29f43a664223dad [diff] | |
parent | 6db47d2d5870b6122658d2f8fb6fbb8738e44a61 [diff] |
[automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into pi-dev am: 15336c87fa -s ours am: 47d2f291e3 -s ours am: 6db47d2d58 -s ours am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 55cd8952c0 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15358518 Change-Id: If3dd19e9e31586eb5e63c87045016f8aa17c4a1b