| commit | 028ac7e69c0b3402b53a73c332d675eaa9c72813 | [log] [tgz] |
|---|---|---|
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 10 23:52:17 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 10 23:52:17 2021 +0000 |
| tree | 8741550c7029e72ca228ac09514f2678098c44ca | |
| parent | 5f73bdde66805a2f6a51c0b9b313a85d407dbbb0 [diff] | |
| parent | 18671436c2351f4c8232995e9f81ddf415e8c2dd [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: 6ec148e202 -s ours am: 4d380e273b -s ours am: 18671436c2 -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: I8dfc7e8f4e9b6445eb3e26e0720a327c903cddeb