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:
5ddde02
d23e0d6
)
Merge "Update power manager to track uid state like netstats." into mnc-dev
author
Dianne Hackborn
<hackbod@google.com>
Tue, 19 May 2015 16:44:09 +0000
(16:44 +0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Tue, 19 May 2015 16:44:12 +0000
(16:44 +0000)
1
2
core/java/android/app/ActivityManagerNative.java
patch
|
diff1
|
diff2
|
blob
|
history
core/java/android/app/IActivityManager.java
patch
|
diff1
|
diff2
|
blob
|
history
services/core/java/com/android/server/am/ActivityManagerService.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
core/java/android/app/ActivityManagerNative.java
Simple merge
diff --cc
core/java/android/app/IActivityManager.java
Simple merge
diff --cc
services/core/java/com/android/server/am/ActivityManagerService.java
Simple merge
OSDN Git Service
