| commit | 16fa021560398a6e816911b9c6c4731ca219c15f | [log] [tgz] |
|---|---|---|
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Sep 28 23:27:47 2022 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Sep 28 23:27:47 2022 +0000 |
| tree | cce4bd6cde88b1d3928c614a725ba741207d3797 | |
| parent | 4840155935ec2f9c7664fbf4c229e6168a5de6e7 [diff] | |
| parent | 04041d515c5f679841ac9d6cbf0c779a88b9c965 [diff] |
Merge changes from topic "am-6a80ad22a95146729ffb32509025cb72" into tm-d1-dev-plus-aosp * changes: [automerger skipped] Merge changes from topic "presubmit-am-b3ba9bd7b2c9457694d3fdc81abd6a37" into tm-dev am: 7429f710f7 -s ours am: 3a28ab401b -s ours [automerger skipped] [automerged blank] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern 2p: 98e3bfdebb 2p: 353e941920 am: 9e76d2c1fb -s ours am: 6cfd8c6aa3 -s ours