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:
1be0392
49392d3
)
Merge "Add stats logging to ServiceManager and NPMS" into pi-dev
author
TreeHugger Robot
<treehugger-gerrit@google.com>
Thu, 12 Apr 2018 01:13:07 +0000
(
01:13
+0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Thu, 12 Apr 2018 01:13:07 +0000
(
01:13
+0000)
1
2
services/core/java/com/android/server/am/ActivityManagerService.java
patch
|
diff1
|
diff2
|
blob
|
history
services/core/java/com/android/server/net/NetworkPolicyManagerService.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/net/NetworkPolicyManagerService.java
Simple merge