| commit | f6b9251fbcb6e956cb10b15e573fd75914cda86b | [log] [tgz] |
|---|---|---|
| author | Dave Mankoff <mankoff@google.com> | Tue Aug 10 20:19:32 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 10 20:19:32 2021 +0000 |
| tree | 6da1311abc5b9539ea69a07be5cb98d02d4b7a25 | |
| parent | df88fd09f667d60182786d90f860491fdf4b0aa3 [diff] | |
| parent | 49ee68690fb36515c14d1dfcb7db12cd327da77a [diff] |
[automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into qt-dev am: b279744b70 am: 0122320cb2 -s ours am: 5a382b6915 -s ours am: 4b8f7a7991 -s ours am: 49ee68690f -s ours am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 90824714b5 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15358519 Change-Id: I68652c32d2023f057a9eb5c49329da8f8247c090