diff options
| author | 2022-09-15 18:08:47 +0000 | |
|---|---|---|
| committer | 2022-09-15 18:08:47 +0000 | |
| commit | 50f0b58d804dc39b662d2eba38f3fd329b0f3daf (patch) | |
| tree | 00fe37170748b1fd3b235d37baef22268e641f8a /libs/androidfw/ResourceTimer.cpp | |
| parent | 65ea1811cac1e6f3e6fde516495a72617bca5f68 (diff) | |
| parent | 582d8e0262df8ef42c24929d97e48d94c4d538a8 (diff) | |
[automerger skipped] Merge "[DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock" into sc-dev am: d1afd041a1 -s ours am: 582d8e0262 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19641101
Change-Id: Id22f8f5bccf9f5c8a8aa21bbda4c363da4dd4864
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