| commit | 4d380e273b12505a1f93b21fd067743a4cdaa8de | [log] [tgz] |
|---|---|---|
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 10 23:28:03 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 10 23:28:03 2021 +0000 |
| tree | ce8e6b59e7d8cf09befc39cca71bcb3a9c6610e8 | |
| parent | 7d6482b4b1a0eddbd4deb54fd7d6aed6fcf958e2 [diff] | |
| parent | 6ec148e2020d75345e0f9c162a68540980875c22 [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 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: Ib120963304d43799c1141696832645802a3d7411