commit 76cbd841931d0de490f4f63c467d6bbdd0feb057
author The Android Open Source Project <initial-contribution@android.com> Thu Aug 08 14:14:12 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Aug 08 14:14:12 2013 -0700
tree 3750789e371504d011b619b44b4e1ff148dbb46c
parent ff2aed99fcc0656c5d5dd989ddd373834631286c
parent f4316f6d5b9a87cd366af4f0f22ab8713ac1b8ad

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.