am f4316f6d
: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
* commit 'f4316f6d5b9a87cd366af4f0f22ab8713ac1b8ad': 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.
This commit is contained in:
committed by
Android Git Automerger
commit
76cbd84193