diff options
| author | 2022-09-15 21:00:36 +0000 | |
|---|---|---|
| committer | 2022-09-15 21:00:36 +0000 | |
| commit | 348c17ce2f3d0c2e37fa9e843626ff336aeb783b (patch) | |
| tree | 9101d80e8b08e3b5bea56695ea3c4d47bf73edc6 /libs/androidfw/ResourceTimer.cpp | |
| parent | 9d756fbb4fe29fc529c64ed4ac742dfc0cc7b089 (diff) | |
| parent | 0ca1b0e665fc34d8bfa2f00792246a11db8591fe (diff) | |
Merge "[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: 50f0b58d80 -s ours am: 5933a823ea -s ours am: 31a5f9dae5 -s ours" into tm-d1-dev-plus-aosp am: 551c77cc61 -s ours am: 0ca1b0e665 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19641101
Change-Id: I9729898250295f4025444da751dff16004a692d6
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