diff options
| author | 2022-09-15 19:53:39 +0000 | |
|---|---|---|
| committer | 2022-09-15 19:53:39 +0000 | |
| commit | d8449242240e992edb4eed3f8f13ddfc17e3b590 (patch) | |
| tree | 240b53504584725edd9e343b2dd8fedcb380521c /libs/androidfw/ResourceTimer.cpp | |
| parent | b0d5eda9b6f1e1f16077ef26969f3c2aab38d6d4 (diff) | |
| parent | e9ccd9db503336f5af1c6558c74fa96cbde8db51 (diff) | |
[automerger skipped] [DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock am: c27cf661a6 am: 2ebce335cc -s ours am: 13ac3a30cc -s ours am: 7ef1e5f3a7 -s ours am: 65ea1811ca -s ours am: e06f474627 -s ours am: e9ccd9db50 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19952027
Change-Id: I4f365ccf7ecfc7fdff0f1dbbd986ac448648cfd1
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