diff options
| author | 2022-09-19 21:09:22 +0000 | |
|---|---|---|
| committer | 2022-09-19 21:09:22 +0000 | |
| commit | e8b730b5527a39713c21783e385afe8ef4eeef59 (patch) | |
| tree | 8b2b068b7dbf7161255ce9abf1161e605e33f7f0 /libs/androidfw/ResourceTimer.cpp | |
| parent | aebe4548c2a14ba744abf13b2f5f9d652f682e16 (diff) | |
| parent | 1e7904ddd300b43e6a5bce6bda90d31918737674 (diff) | |
[automerger skipped] Merge "[DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock" into qt-dev am: c184d7b721 am: f3c6684b16 -s ours am: 5ddcc96b01 -s ours am: b7075acb14 -s ours am: 97f625773a -s ours am: 605261cc55 -s ours am: 1e7904ddd3 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19667859
Change-Id: I835fc8d404daca757e53c10081190109ede96fc1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ResourceTimer.cpp')
0 files changed, 0 insertions, 0 deletions