OSDN Git Service

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


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