diff options
| author | 2022-09-15 20:22:25 +0000 | |
|---|---|---|
| committer | 2022-09-15 20:22:25 +0000 | |
| commit | 2fe69d854293fe0960f46a94aab0a1065f064c64 (patch) | |
| tree | b7f70b18d8f0e92c1c4fa37d1e9f061b4be5c9f4 /libs/androidfw/ResourceTimer.cpp | |
| parent | 070d3a8ec9bf76437d046665854c78478ec9e2b9 (diff) | |
| parent | e7d18c384bfeae8ccdab1625e31f2ad00d0a0399 (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: 841bc866be -s ours am: e7d18c384b -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19952027
Change-Id: I2f8e828967b643ea8e781f24ec8273a92105986c
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