diff options
| author | Eran Messeri <eranm@google.com> | 2020-11-04 13:33:46 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-04 13:33:46 +0000 |
| commit | d81f5ef79b876cd71476c8b64ab6b3c0091ba85d (patch) | |
| tree | d1169d61892adea8604fc1a5fab9143333964e90 /packages/SystemUI/src/com/android/keyguard/KeyguardSliceViewController.java | |
| parent | 838709fe2dd09300cc1af7ee5e0a3981438d511d (diff) | |
| parent | 275329ba8eee9e4cabdf32cd014f2df00e1d60e7 (diff) | |
[automerger skipped] Merge "DO NOT MERGE: Introduce DPMS shim for active DO/PO check" am: 817969762e am: b0c59d4b6b am: b9ef876ca1 am: 275329ba8e -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1486196
Change-Id: Idd15b5c294966297136e45d19c9ff238d47c2983
Diffstat (limited to 'packages/SystemUI/src/com/android/keyguard/KeyguardSliceViewController.java')
0 files changed, 0 insertions, 0 deletions