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:
93a5969
04c3cc6
)
Merge "Use splashscreen if we can't fill horizontaly with snapshot" into oc-dev
author
Jorim Jaggi
<jjaggi@google.com>
Thu, 15 Jun 2017 04:25:08 +0000
(
04:25
+0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 15 Jun 2017 04:25:08 +0000
(
04:25
+0000)
am:
04c3cc6d12
Change-Id: I048aeb67b8e17bbece7a07827ffb3745c6adbe63
1
2
services/core/java/com/android/server/am/ActivityManagerService.java
patch
|
diff1
|
diff2
|
blob
|
history
services/core/java/com/android/server/am/ActivityStackSupervisor.java
patch
|
diff1
|
diff2
|
blob
|
history
services/core/java/com/android/server/wm/WindowManagerService.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/core/java/com/android/server/am/ActivityManagerService.java
Simple merge
diff --cc
services/core/java/com/android/server/am/ActivityStackSupervisor.java
Simple merge
diff --cc
services/core/java/com/android/server/wm/WindowManagerService.java
Simple merge
OSDN Git Service
