commit | 1c7009b225f79efef1ceb19df0828cb5ea90afc5 | [log] [tgz] |
---|---|---|
author | Bill Yi <[email protected]> | Mon Sep 16 20:12:19 2024 +0000 |
committer | Automerger Merge Worker <[email protected]> | Mon Sep 16 20:12:19 2024 +0000 |
tree | a765f27c82e492317fcc3f3f198dee3434bc5ee4 | |
parent | 0db9a02a0fc3810eda2b0d95f58d48b9b0111508 [diff] | |
parent | 445ea15f213d3a7d530146493cd2a2868ead85e3 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into main am: 3181c30c40 -s ours am: 445ea15f21 -s ours am skip reason: contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/modules/DeviceLock/+/3263816 Change-Id: Ib26a3c1a39ac0853f34e7eedb8023d15532f1fad Signed-off-by: Automerger Merge Worker <[email protected]>