Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 16fa0215 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

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: 7429f710 -s ours am: 3a28ab40 -s ours
  [automerger skipped] [automerged blank] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern 2p: 98e3bfde 2p: 353e9419 am: 9e76d2c1 -s ours am: 6cfd8c6a -s ours
parents 48401559 04041d51
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment