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:
7352265
fa97fcf
)
Merge "network: Adds the functionality to parse uid in netlink messages." into nyc-dev
author
Ruchi Kandoi
<kandoiruchi@google.com>
Sat, 14 May 2016 01:32:53 +0000
(
01:32
+0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Sat, 14 May 2016 01:32:54 +0000
(
01:32
+0000)
1
2
services/core/java/com/android/server/am/BatteryStatsService.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/core/java/com/android/server/am/BatteryStatsService.java
Simple merge