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:
8837aff
14ae39a
)
Merge "BatteryStats: Acquire network stats without BatteryStatsImpl lock" into oc-dev
author
Adam Lesinski
<adamlesinski@google.com>
Wed, 31 May 2017 22:36:55 +0000
(22:36 +0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Wed, 31 May 2017 22:37:09 +0000
(22:37 +0000)
1
2
core/java/com/android/internal/os/BatteryStatsImpl.java
patch
|
diff1
|
diff2
|
blob
|
history
services/core/java/com/android/server/am/BatteryStatsService.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
core/java/com/android/internal/os/BatteryStatsImpl.java
Simple merge
diff --cc
services/core/java/com/android/server/am/BatteryStatsService.java
Simple merge
OSDN Git Service
