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:
8a04ed4
21bc3a3
)
Merge "Add tether offload traffic to interface stats as well." into oc-mr1-dev
author
Lorenzo Colitti
<lorenzo@google.com>
Sat, 19 Aug 2017 01:02:33 +0000
(
01:02
+0000)
committer
android-build-merger
<android-build-merger@google.com>
Sat, 19 Aug 2017 01:02:33 +0000
(
01:02
+0000)
am:
21bc3a39a4
Change-Id: I4e8e923d68dce1a4a68608dbd6c75a91165aa4ee
1
2
services/core/java/com/android/server/NetworkManagementService.java
patch
|
diff1
|
diff2
|
blob
|
history
telephony/java/android/telephony/TelephonyManager.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/core/java/com/android/server/NetworkManagementService.java
Simple merge
diff --cc
telephony/java/android/telephony/TelephonyManager.java
Simple merge
OSDN Git Service
