diff options
| author | 2022-09-15 20:59:03 +0000 | |
|---|---|---|
| committer | 2022-09-15 20:59:03 +0000 | |
| commit | 8aae700c24af87c1f99ed9982496a6d01b41c811 (patch) | |
| tree | 9101d80e8b08e3b5bea56695ea3c4d47bf73edc6 /libs/androidfw/ResourceTimer.cpp | |
| parent | 395a6df8eaf449649ca4a8cc2c1d805a64eacc0d (diff) | |
| parent | 3eaa0883f917d3705980dd2b8f18398d25654cdc (diff) | |
Merge "[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" into tm-d1-dev-plus-aosp am: d673d224ee -s ours am: 3eaa0883f9 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19952027
Change-Id: Idaf12c8cbb77c8caa414702500073d4c8b825c12
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