OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6d80d47 0ffbbad)
am 0ffbbad5: am 60544e74: am 3dddd8cb: Ensure all active Device Admins are listed.
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 '0ffbbad5b1ad34bb2add06f7ec030191ed94e866':
  Ensure all active Device Admins are listed.


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