diff options
| author | Dave Mankoff <mankoff@google.com> | 2021-08-10 14:51:58 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-10 14:51:58 +0000 |
| commit | 40ddedac51ce670f01752cf7bc046042ffead038 (patch) | |
| tree | 522b0c24342a5ed47a2e42dd1ba1d540eb0616b5 /core/java/android | |
| parent | 9de7969adf9ea44c39168461386c4633bcd773da (diff) | |
| parent | 841ccfd9456332ceba32e8b1f9564d27a5dc0d08 (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 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: Id3352f0851c22bb170b4a7ebb93e44ff557eb8a1
Diffstat (limited to 'core/java/android')
0 files changed, 0 insertions, 0 deletions