diff options
| author | 2022-09-15 20:23:49 +0000 | |
|---|---|---|
| committer | 2022-09-15 20:23:49 +0000 | |
| commit | 0ca1b0e665fc34d8bfa2f00792246a11db8591fe (patch) | |
| tree | b7f70b18d8f0e92c1c4fa37d1e9f061b4be5c9f4 /libs/androidfw/ResourceTimer.cpp | |
| parent | d0118289eb546a2ab95c892fdb3892b28060f0f4 (diff) | |
| parent | 551c77cc61f40f9f7c51e62d02a70b5096b8dacb (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 skip reason: Merged-In I7c8714a177bc85fbce92f6e8fe911f74ca2ac243 with SHA-1 1e7087f113 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19641101
Change-Id: I1b7e4bdd248e1102bfbcecc2c1346887e65a2b60
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