From: The Android Open Source Project Date: Thu, 8 Aug 2013 22:56:11 +0000 (-0700) Subject: am 76cbd841: am f4316f6d: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday... X-Git-Tag: android-x86-6.0-r1~2114^2~350 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=8c1845a6d669b03c2827965042f2e47e49f2d6b1;p=android-x86%2Fpackages-apps-Settings.git am 76cbd841: am f4316f6d: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge * commit '76cbd841931d0de490f4f63c467d6bbdd0feb057': 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. --- 8c1845a6d669b03c2827965042f2e47e49f2d6b1