commit 98f71be4d72b988b5fdbdaec134495a5daae62fd
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Aug 10 23:34:44 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Aug 10 23:34:44 2021 +0000
tree bbcc46754da98d23cfcd639e67a9b651b71e6aad
parent 5656402f58fb3b164d85cfc8bebae9522205d518
parent 4bc1c08af1f7118afe58a653558ca2bf50740a94

Merge "[automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into oc-mr1-dev am: 58dcd2c312 -s ours am: 70a5657935 -s ours" into qt-dev am: 7162d024b2 -s ours am: 50c7797637 -s ours am: 0fe296d677 -s ours am: 26c8f8d054 -s ours am: 4bc1c08af1 -s ours

am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 de779f8124 is already in history

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

Change-Id: If96e86f53d3e7eb19f7db6377539f26ee40499bd