| commit | 9e0def6d81b1040ff7e25459178d3f2bbbc9bc1c | [log] [tgz] |
|---|---|---|
| author | Dave Mankoff <mankoff@google.com> | Tue Aug 10 15:10:00 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 10 15:10:00 2021 +0000 |
| tree | 2514c89f6e65e6a9ba444b43ec934b07682b12e1 | |
| parent | dcc638f5754864891ef581ec57e75e6b867dc621 [diff] | |
| parent | 0ef874ab7223d0debcd5aeab5759ee9cb48f83f6 [diff] |
[automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into rvc-dev am: af9ebd49b1 -s ours am: 4d56213cf8 -s ours am: 01429a24a1 -s ours am: 841ccfd945 -s ours am: 40ddedac51 -s ours am: 0ef874ab72 -s ours am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 c2c2fa79ff is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15358520 Change-Id: I2f6be9db4cde1ab5ef8796bfcb3f383e59f7cef6