OSDN Git Service

Merge changes I82d3bee0,I9c9413d7 am: deb4eb5d05 am: 51c3d6a8bf
authorLorenzo Colitti <lorenzo@google.com>
Tue, 15 Aug 2017 02:25:36 +0000 (02:25 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 15 Aug 2017 02:25:36 +0000 (02:25 +0000)
commit20fa45e3a91216b13680efca764ac455b488d176
tree5064409cdd762bbfa8ca073e0e50bda9da29d616
parent1f1d124bfea987f39b82914a722628a53ceef6ec
parent0cf31d4d6d22936f9f0a6aed004f95ff6f43e169
Merge changes I82d3bee0,I9c9413d7 am: deb4eb5d05 am: 51c3d6a8bf
am: 0cf31d4d6d

Change-Id: I759ed9a79b6ebfa2ae6143167c0dd7d0ad84c67f
services/core/java/com/android/server/connectivity/tethering/OffloadHardwareInterface.java
tests/net/java/com/android/server/connectivity/tethering/OffloadControllerTest.java