OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4fb1f87 681b21f)
am 681b21f3: resolved conflicts for merge of 5d21820a to jb-mr2-dev
authorAlex Klyubin <klyubin@google.com>
Fri, 7 Jun 2013 00:51:57 +0000 (17:51 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 7 Jun 2013 00:51:57 +0000 (17:51 -0700)
* commit '681b21f3e4ef0a63d982eca0e9d1896422bc30ff':
  Permit deactivation of malformed Device Admins.


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