OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6165009
1a34a41
)
Merge "Fixed NPE in canAddMoreManagedProfiles" am: a83222e4fb am: 8d3a8b1327
author
yuanhao
<yuanhao@xiaomi.com>
Thu, 19 Jan 2017 19:10:44 +0000
(19:10 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 19 Jan 2017 19:10:44 +0000
(19:10 +0000)
am:
1a34a41268
Change-Id: Ic3673491705af125a88f66460996911244184fc8
1
2
services/core/java/com/android/server/pm/UserManagerService.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/core/java/com/android/server/pm/UserManagerService.java
Simple merge