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:
f572fdd
d92897d
)
Merge "Check for DeviceAdminInfo type before casting" into lmp-dev
author
Zoltan Szatmary-Ban
<szatmz@google.com>
Thu, 11 Sep 2014 10:52:56 +0000
(10:52 +0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Thu, 11 Sep 2014 10:52:57 +0000
(10:52 +0000)
1
2
src/com/android/settings/DeviceAdminSettings.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/com/android/settings/DeviceAdminSettings.java
Simple merge