OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ff2aed9 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 21:14:12 +0000 (14:14 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 8 Aug 2013 21:14:12 +0000 (14:14 -0700)
commit76cbd841931d0de490f4f63c467d6bbdd0feb057
tree3750789e371504d011b619b44b4e1ff148dbb46ctree | snapshot
parentff2aed99fcc0656c5d5dd989ddd373834631286ccommit | diff
parentf4316f6d5b9a87cd366af4f0f22ab8713ac1b8adcommit | diff
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.
packages/apps/Settings
About OSDN
Find Software
Develop Software
Help