diff options
| author | 2022-09-15 20:19:52 +0000 | |
|---|---|---|
| committer | 2022-09-15 20:19:52 +0000 | |
| commit | a8a1b14eaedd661ce6548d814f911028c801f3eb (patch) | |
| tree | ecb3111aa9ab02885ffaad6655e0aeed769e7844 /libs/androidfw/ResourceTimer.cpp | |
| parent | 176361386d112615e4c688f7a26ce39d45f5bb6f (diff) | |
| parent | b0d5eda9b6f1e1f16077ef26969f3c2aab38d6d4 (diff) | |
[automerger skipped] [automerge] [DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock 2p: 1e7087f113 am: 1bc514701a -s ours am: c64e0d7063 -s ours am: aff81a5527 -s ours am: 1b1dc203ba -s ours am: b0d5eda9b6 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19641101
Change-Id: I0b887de7773b0f70f72bac0c34dc6cd9806ca887
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