diff options
| author | 2023-09-18 19:47:27 +0000 | |
|---|---|---|
| committer | 2023-09-18 19:47:27 +0000 | |
| commit | 0d7355ac7a46209e9ce414173d99cc3e210ef1e7 (patch) | |
| tree | 71e5b12a06e8eda0703b07a616806867c44c5241 /libs/androidfw/AttributeResolution.cpp | |
| parent | d933d764d0d1641dbef9bafda118fbd6d21da9db (diff) | |
| parent | 2acb7db524ff3a8414a9eb67a64b5c607bbbb4be (diff) | |
[automerger skipped] Require permission to unlock keyguard am: 7f28e3eaaf -s ours am: cbdde0eb62 -s ours am: f4eace9709 -s ours am: 7c2b1325e9 -s ours am: 219d6da566 -s ours am: 7b2ead4023 -s ours am: 2acb7db524 -s ours
am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 712ec1f4f8 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24339446
Change-Id: If88aa19eab19e202634e3bb683b2035c12a395e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/AttributeResolution.cpp')
0 files changed, 0 insertions, 0 deletions