commit | 47d2f291e3fdd9f29fcb389e42eb9841d98afa0b | [log] [tgz] |
---|---|---|
author | Dave Mankoff <mankoff@google.com> | Tue Aug 10 19:11:47 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 10 19:11:47 2021 +0000 |
tree | a8439aa9ee07089f35666d3dca1e44165600d70f | |
parent | b279744b701937dee9882ae7b0949287d50af2bf [diff] | |
parent | 15336c87fa2928b3d22cc2ca4cc386fdc05b5216 [diff] |
[automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into pi-dev am: 15336c87fa -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: I2ae8d9dadf42dea7071e2ac23f00d4ed3333660d