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:
f4c08fe
66c0d7c
)
Merge "Added dumsys activity starter" into oc-dev am: ea0de895bb am: eb75461502
author
Wale Ogunwale
<ogunwale@google.com>
Tue, 20 Jun 2017 23:50:43 +0000
(23:50 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 20 Jun 2017 23:50:43 +0000
(23:50 +0000)
am:
66c0d7ce2f
Change-Id: Ia3a72146a3df41a2c5177394f5a693cd84f60de2
1
2
services/core/java/com/android/server/am/ActivityManagerService.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/core/java/com/android/server/am/ActivityManagerService.java
Simple merge