tree 1319c6a71f7aa1c2c4eea4dcf3aa655e58f64ce3
parent 4b6d85e98c2c6f939312d048a3dfb3e29740ddf2
parent dfc0ec200f1b4afd96e415f878d64d3a9f726052
author Tina Zhou <tinazh@google.com> 1487120096 +0000
committer android-build-merger <android-build-merger@google.com> 1487120096 +0000

Merge "Don't require WiFi in CtsHostsideNetworkTests" into nougat-cts-dev
am: dfc0ec200f

Change-Id: I7ff23d2936d7e9e21eaf8909b2e07c5c816cc32c