tree 9a5ce2947091180c4de9839f6882653a05b49a57
parent d443dc84791f8f18129008d5f336a95870869a01
parent 96187b032ad9a4fd1f1ad6888e1344eab7edc26d
author bohu <bohu@google.com> 1486143827 +0000
committer android-build-merger <android-build-merger@google.com> 1486143827 +0000

Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43" into nougat-mr1-cts-dev am: 266d07f3cb am: cf06f6bca3
am: 96187b032a

Change-Id: I81afae1bb2ce8995346a45ab24a483171d1ffa56