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:
aa4d6f1
f9f5cf9
)
Merge "Simplify UpstreamNetworkMonitor callback handling"
author
Erik Kline
<ek@google.com>
Thu, 12 Jan 2017 10:26:43 +0000
(10:26 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 12 Jan 2017 10:26:43 +0000
(10:26 +0000)
am:
f9f5cf9d9b
Change-Id: I642567d81b6b8908b2ef7afea8d15628330481f9
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