commit | 134f77e0db32ccfec425baceedec9eabed54de2d | [log] [tgz] |
---|---|---|
author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Mon Oct 09 18:24:31 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Oct 09 18:24:31 2023 +0000 |
tree | 7a400ea09708672405f0ba6f6d85c97afc357d1d | |
parent | 570af99fa8dd0d6d9357dcbac1440bc760dbfc16 [diff] | |
parent | af821717bef7f9a3fab840e394e11cd923f800ba [diff] |
[automerger skipped] Merge "Rename CanUnlockWithActiveUnlockTest.kt" into main am: 6dc2dff8aa am: 45049c0a2d am: f67e402ceb am: 6c53fe6ae9 am: af821717be -s ours am skip reason: Merged-In Ib1b4bbcf980545dd0ee7b08951185d4038954e37 with SHA-1 2e98f22c85 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2778007 Change-Id: Ib01cfa60e670390030541a9bbb72f9ac46853e24 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>