OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c8a7ae3 f4316f6)
am f4316f6d: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do...
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 8 Aug 2013 13:36:53 +0000 (06:36 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 8 Aug 2013 13:36:53 +0000 (06:36 -0700)
* 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.


Trivial merge
packages/apps/Settings
About OSDN
Find Software
Develop Software
Help