diff options
| author | Dave Mankoff <mankoff@google.com> | 2021-08-10 15:05:07 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-10 15:05:07 +0000 |
| commit | 99942e5eeb84a0c0817bed8fc41aceac1cd2c3b2 (patch) | |
| tree | 33d3ce04504905a1e494ab935c1513f374e0096f /core/java/android | |
| parent | 372b6061fd9216f7bfac334acb5d4566149126f0 (diff) | |
| parent | 70dfd9ef5d86fc170d9862f4de901a4a6e590a5a (diff) | |
[automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into rvc-dev am: af9ebd49b1 am: f27380d2ed -s ours am: bc0c531069 -s ours am: cc31d16bbd -s ours am: 70dfd9ef5d -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/+/15358520
Change-Id: I2bba000973d40661a90fab11ac4e14f7fc3b3ff7
Diffstat (limited to 'core/java/android')
0 files changed, 0 insertions, 0 deletions