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

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

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

* commit 'f4316f6d':
  Import translations. DO NOT MERGE
  Fix issue #10190597: "Any permission restrictions" is displayed after a...
  Reset app preferences now resets all app ops.
  Import translations. DO NOT MERGE
  Fix issue #10190597: "Any permission restrictions" is displayed after a...
  Reset app preferences now resets all app ops.
  Revert "Completely remove app ops activity."
  Completely remove app ops activity.
parents ff2aed99 f4316f6d

There are no changes