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

Skip to content
Commit e260ebd9 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge "[DO NOT MERGE] Rollup changes from R related to... 

[automerger skipped] Merge "[DO NOT MERGE] Rollup changes from R related to CertInstaller and KeyChain" am: 3846b1e2 am: 70b6c132 -s ours am: 0cb2bb83

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1363580

Change-Id: I9ccbfe52c2bdcec25331bb20b8231a73a75dfc6f
parents ef69c1a6 0cb2bb83
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment