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:
1f1d124
0cf31d4
)
Merge changes I82d3bee0,I9c9413d7 am: deb4eb5d05 am: 51c3d6a8bf
author
Lorenzo Colitti
<lorenzo@google.com>
Tue, 15 Aug 2017 02:25:36 +0000
(
02:25
+0000)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 15 Aug 2017 02:25:36 +0000
(
02:25
+0000)
am:
0cf31d4d6d
Change-Id: I759ed9a79b6ebfa2ae6143167c0dd7d0ad84c67f
1
2
services/core/java/com/android/server/connectivity/tethering/OffloadHardwareInterface.java
patch
|
diff1
|
diff2
|
blob
|
history
tests/net/java/com/android/server/connectivity/tethering/OffloadControllerTest.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/core/java/com/android/server/connectivity/tethering/OffloadHardwareInterface.java
Simple merge
diff --cc
tests/net/java/com/android/server/connectivity/tethering/OffloadControllerTest.java
Simple merge