OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 33adccd f96a86c)
am f96a86c9: am 6d80d477: am 0bccd7e7: am 5f28c77b: am d6086125: Fix issue #9074296...
authorDianne Hackborn <hackbod@google.com>
Thu, 6 Jun 2013 19:32:46 +0000 (12:32 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 6 Jun 2013 19:32:46 +0000 (12:32 -0700)
* commit 'f96a86c99d7505e15a39266967cf4d4d75295af1':
  Fix issue #9074296: Device Admins can activate in a way...


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