| commit | f49c91e6a876acd9afa0de6ccd4124d2db3690fc | [log] [tgz] |
|---|---|---|
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 10 23:52:38 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 10 23:52:38 2021 +0000 |
| tree | 8741550c7029e72ca228ac09514f2678098c44ca | |
| parent | c151a0669c4da3ff8b838c95f7e63ed802a52ace [diff] | |
| parent | 285f1b264f6f38a3353e52c946409c5b3313a241 [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: 285f1b264f -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: I3005ffb647815776fad2df013e76a5fb17ea06fb