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:
5527ac9
2d21d1b
)
Pre-setup restrictions DO NOT MERGE am: e6ad6e866b
author
Jason Monk
<jmonk@google.com>
Fri, 15 Jul 2016 14:03:03 +0000
(14:03 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 15 Jul 2016 14:03:03 +0000
(14:03 +0000)
am:
2d21d1b9cf
Change-Id: I1fc62827de765434ac88a7cb75d63febb074b565
1
2
src/com/android/settings/users/UserSettings.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/com/android/settings/users/UserSettings.java
Simple merge