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

Commit ee53d98c authored by The Android Open Source Project's avatar The Android Open Source Project Committed by Android Git Automerger
Browse files

am 302bd5c7: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge 

* commit '302bd5c7':
  Don't show ApnEditor as a dialog
  Import translations. DO NOT MERGE
  Allow hidden apps to opt-out
  resolved conflicts for merge of 5d21820a to jb-mr2-dev
  Fix issue #9074296: Device Admins can activate in a way...
  Ensure all active Device Admins are listed.
parents 03a9fb67 302bd5c7
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