| commit | 841ccfd9456332ceba32e8b1f9564d27a5dc0d08 | [log] [tgz] |
|---|---|---|
| author | Dave Mankoff <mankoff@google.com> | Tue Aug 10 14:40:10 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 10 14:40:10 2021 +0000 |
| tree | b0a7fe560bf1c2114eb43704fb23ad1ceca50e85 | |
| parent | 35c19970243a9da20590318033644e0df89bc249 [diff] | |
| parent | 01429a24a157abd5d02d116e01cc905b1af88b8a [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 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: I0b9d6d64a399fb666b7b013324f8a8b6edd4a905