commit | 0ef874ab7223d0debcd5aeab5759ee9cb48f83f6 | [log] [tgz] |
---|---|---|
author | Dave Mankoff <mankoff@google.com> | Tue Aug 10 15:05:39 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 10 15:05:39 2021 +0000 |
tree | 33d3ce04504905a1e494ab935c1513f374e0096f | |
parent | 12b2f1aa48ebbc126fbe565f04c3ef02cf43ed9c [diff] | |
parent | 40ddedac51ce670f01752cf7bc046042ffead038 [diff] |
[automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into rvc-dev am: af9ebd49b1 -s ours am: 4d56213cf8 -s ours am: 01429a24a1 -s ours am: 841ccfd945 -s ours am: 40ddedac51 -s ours am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 c2c2fa79ff is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15358520 Change-Id: I3edbe67a96ac77fe3c81b2f29eb5fb281c6c1634