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

Commit 57c29c6f authored by Jim Miller's avatar Jim Miller Committed by android-build-merger
Browse files

Merge "resolve merge conflicts of f950ec9b to nyc-dev" into nyc-dev am: 0db3ad24 am: 97fb2690 

am: 1afcb4aa

* commit '1afcb4aa':
  Fix missing permission check when saving pattern/password

Change-Id: I8a8b88c8a1d7af18ca4bae9c4dafc42ad4385215
parents b35b1afd 1afcb4aa
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