diff options
| author | 2023-09-18 22:20:08 +0000 | |
|---|---|---|
| committer | 2023-09-18 22:20:08 +0000 | |
| commit | 892f2fa41b808dfd1d0789854f6c8e5b16e1271c (patch) | |
| tree | 261dc8c3231b76008dfe261612e0025f8bfed58e /libs/androidfw/StringPool.cpp | |
| parent | be9247050fac5468edcf9e023370afd0d6e07597 (diff) | |
| parent | aa406481c40564da8ac917a46c10b6a026724e69 (diff) | |
[automerger skipped] Merge "Require permission to unlock keyguard" into sc-dev am: b25ee8669f -s ours am: c1e069ef40 -s ours am: 75495d90ae -s ours am: bedfad328a -s ours am: ed66255cab -s ours am: 1e4cc975ff -s ours am: 5c31ee97b0 -s ours am: f983464e70 -s ours am: aa406481c4 -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: I43975a3145f34871ec585fd87c39056d5862b137
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions