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:
7c230c6
b0f03a6
)
Merge "[Frameworks] Add an 'am' cmd option to enable streaming in profiling." am...
author
Shukang Zhou
<shukang@google.com>
Fri, 27 Jan 2017 19:01:44 +0000
(19:01 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 27 Jan 2017 19:01:44 +0000
(19:01 +0000)
am:
b0f03a64ea
Change-Id: I35fa80e43cd4f6af76099848714f838f217b7989
1
2
cmds/am/src/com/android/commands/am/Am.java
patch
|
diff1
|
diff2
|
blob
|
history
services/core/java/com/android/server/am/ActivityManagerService.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
cmds/am/src/com/android/commands/am/Am.java
Simple merge
diff --cc
services/core/java/com/android/server/am/ActivityManagerService.java
Simple merge