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:
df94885
4fe508b
)
Merge "Changing the message on user switching dialog."
author
Suprabh Shukla
<suprabh@google.com>
Mon, 23 Nov 2015 23:51:25 +0000
(23:51 +0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Mon, 23 Nov 2015 23:51:25 +0000
(23:51 +0000)
1
2
core/res/res/values/strings.xml
patch
|
diff1
|
diff2
|
blob
|
history
core/res/res/values/symbols.xml
patch
|
diff1
|
diff2
|
blob
|
history
services/core/java/com/android/server/am/ActivityManagerService.java
patch
|
diff1
|
diff2
|
blob
|
history
services/core/java/com/android/server/am/UserController.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
core/res/res/values/strings.xml
Simple merge
diff --cc
core/res/res/values/symbols.xml
Simple merge
diff --cc
services/core/java/com/android/server/am/ActivityManagerService.java
Simple merge
diff --cc
services/core/java/com/android/server/am/UserController.java
Simple merge
OSDN Git Service
