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:
38902fc
b50a684
)
Merge "Wifi: Add scanning, activity time and API"
author
Siddharth Ray
<siddharthr@google.com>
Mon, 22 Jan 2018 21:11:59 +0000
(21:11 +0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Mon, 22 Jan 2018 21:11:59 +0000
(21:11 +0000)
1
2
core/java/com/android/internal/os/BatteryStatsImpl.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
core/java/com/android/internal/os/BatteryStatsImpl.java
Simple merge