OSDN Git Service
(root)
/
android-x86
/
packages-apps-Settings.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f4b1aef
0bccd7e
)
am 0bccd7e7: am 5f28c77b: am d6086125: Fix issue #9074296: Device Admins can activate...
author
Dianne Hackborn
<hackbod@google.com>
Thu, 6 Jun 2013 19:29:04 +0000
(12:29 -0700)
committer
Android Git Automerger
<android-git-automerger@android.com>
Thu, 6 Jun 2013 19:29:04 +0000
(12:29 -0700)
* commit '
0bccd7e7f4d6fe4d5c7e1fef151f50ebed7addaf
':
Fix issue #
9074296
: Device Admins can activate in a way...
Trivial merge