OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5aa3f87 a65fa93)
am a65fa934: am 8bfb859e: am 8d5aeffa: am 089d1615: am 01dbfbf9: am efd88e2c: Merge...
authorAlex Klyubin <klyubin@google.com>
Thu, 6 Jun 2013 22:35:41 +0000 (15:35 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 6 Jun 2013 22:35:41 +0000 (15:35 -0700)
* commit 'a65fa934f19ebfe59a8458be733e783292ad8d9c':
  Permit deactivation of malformed Device Admins.


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