diff options
| author | 2022-05-12 18:03:50 +0000 | |
|---|---|---|
| committer | 2022-05-12 18:03:50 +0000 | |
| commit | 832c206a414446e3192be5e42ff2dc563bf630b6 (patch) | |
| tree | eeec6a614a05cd6b99cc58953fc8bc4ab2e7691c /libs/androidfw/StringPool.cpp | |
| parent | 303101b0c21798dd1b3581661eee58217f8fd744 (diff) | |
| parent | 92b65722f89891fdd82b53478c3631a07d6d54c7 (diff) | |
Merge "Don't require awakeKeyguard for activeUnlock" into tm-dev am: 6a69a2c844 am: 92b65722f8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18186409
Change-Id: I85158f68f24dfcd277d358d5a92457586ac9584f
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