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

Commit 41213a7e authored by Zach Jang's avatar Zach Jang Committed by Android Git Automerger
Browse files

am a9fda51c: am 3a5be134: am 22e66b35: am a5842d3e: am f694d378: (-s ours)... 

am a9fda51c: am 3a5be134: am 22e66b35: am a5842d3e: am f694d378: (-s ours) resolved conflicts for b161297d to lmp-mr1-ub-dev

* commit 'a9fda51c':
  DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
parents d897bc6e a9fda51c
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