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:
dcb8cf8
645cd2a
)
Merge "Log upstream network suspend/resume callbacks"
author
Erik Kline
<ek@google.com>
Wed, 11 Oct 2017 04:08:55 +0000
(
04:08
+0000)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 11 Oct 2017 04:08:55 +0000
(
04:08
+0000)
am:
645cd2ad26
Change-Id: I375e47a21d2fc6a5e67ff6367087c22beceb6377
1
2
services/core/java/com/android/server/connectivity/Tethering.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/core/java/com/android/server/connectivity/Tethering.java
Simple merge