| commit | f0623542e1494c5ad18611c3475d1da42a29bfec | [log] [tgz] |
|---|---|---|
| author | Josh Tsuji <tsuji@google.com> | Thu Jan 12 00:52:26 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jan 12 00:52:26 2023 +0000 |
| tree | 04c628a1e6489000bcf2550601d1c5b2bc441fa9 | |
| parent | df3398affc1f3a7017c1d2fe9ad364f213ee27fc [diff] | |
| parent | 5d809fb759f02f0b18d0489a69d74b6f24304c8e [diff] |
Merge "Explicitly re-show rather than reset keyguard if we're not interactive." into tm-qpr-dev am: e8072d9849 am: 5d809fb759 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20929047 Change-Id: I86fbc07997933d62364d01a32465bb0f328f8bbc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>