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:
70a2b34
b32fecd
)
Merge "Added 'dumpsys activity lastanr'" into oc-dev
author
Wale Ogunwale
<ogunwale@google.com>
Sat, 10 Jun 2017 16:05:53 +0000
(16:05 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Sat, 10 Jun 2017 16:05:53 +0000
(16:05 +0000)
am:
b32fecd6e0
Change-Id: Iede7911ea687b7890833ee967da010db6041fb49
1
2
services/core/java/com/android/server/am/ActivityManagerService.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/wm/WindowManagerService.java
Simple merge