| commit | 8c368cf22f1ed6f2dc70ba03fca5705032141239 | [log] [tgz] |
|---|---|---|
| author | Derek Jedral <derekjedral@google.com> | Tue Jan 31 22:05:50 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jan 31 22:05:50 2023 +0000 |
| tree | c5ad13cfc39c780636cdd109080b28d81068c2b7 | |
| parent | 957a35bd26db232cb019f9f8bc554aba6c0ef731 [diff] | |
| parent | f97be2525270ebfd3e2092d75ca60daa714fe3ad [diff] |
[automerger skipped] Add strings for active unlock in settings am: 7e524288b5 am: f97be25252 -s ours am skip reason: Merged-In I41e3b9c1830212303fc3379462e80cb18a23d026 with SHA-1 2221964344 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21085463 Change-Id: I7111f788ce8146de13de0a9bc3fa5ef88211ef65 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>