OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: adc3a28 5aa3f87)
am 5aa3f878: (-s ours) am 0c32da7e: am 6f28e342: am 9f6a1933: am 0ffbbad5: am 60544e7...
authorAlex Klyubin <klyubin@google.com>
Thu, 6 Jun 2013 22:41:41 +0000 (15:41 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 6 Jun 2013 22:41:41 +0000 (15:41 -0700)
* commit '5aa3f8782432c79d01702ca6a7214793501bd476':
  Ensure all active Device Admins are listed.


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