OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9f6a193 089d161)
am 089d1615: am 01dbfbf9: am efd88e2c: Merge "Permit deactivation of malformed Device...
authorAlex Klyubin <klyubin@google.com>
Thu, 6 Jun 2013 22:29:56 +0000 (15:29 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 6 Jun 2013 22:29:56 +0000 (15:29 -0700)
* commit '089d161588f07862ac1e8876a39227e4110b2bec':
  Permit deactivation of malformed Device Admins.


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