| commit | 26c8f8d054425db4c6d9cbc02440cca3bb339b14 | [log] [tgz] |
|---|---|---|
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 10 23:10:44 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 10 23:10:44 2021 +0000 |
| tree | de77466a6fc5ecb28cecbf63d1a2fcf583386aa1 | |
| parent | 671263bccddb4dcda2807614c6f710abdbec07eb [diff] | |
| parent | 0fe296d67715191043ddd6a50895baec14c3c38f [diff] |
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 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: I14648f534f8c1be5bdc5b6bb7c4fd176391cc6a9