diff options
| author | 2022-10-12 20:40:50 +0000 | |
|---|---|---|
| committer | 2022-10-12 20:40:50 +0000 | |
| commit | e2b61df49cdfcd277c78a8873e88e46ea55ee99c (patch) | |
| tree | e643945a1b6b9256a611c3cb82fce2d8bede3f4f /tools/aapt2/ResourceParser.cpp | |
| parent | 1b3195941519afbbdec0865fefc48853f81bf2cc (diff) | |
| parent | f48e967738876eebb5382fc4616fa64bde5ac647 (diff) | |
[automerger skipped] Merge "DO NOT MERGE Use KeyguardStateController for #isShowing" into tm-qpr-dev am: 04821a8990 am: f48e967738 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20024905
Change-Id: Ib319c4a779072e0d1d5bd6c8efde3775538ffcf7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'tools/aapt2/ResourceParser.cpp')
0 files changed, 0 insertions, 0 deletions