tree 9a5ce2947091180c4de9839f6882653a05b49a57
parent ebfbb5ebefdfe47b557cfd14e692246d68deb349
parent 5dd794162b999d65212112d870e87d1909a8ba54
author bohu <bohu@google.com> 1486143965 +0000
committer android-build-merger <android-build-merger@google.com> 1486143965 +0000

Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43 am: 40f71feca4" into nyc-mr1-dev am: 5913ea0554
am: 5dd794162b

Change-Id: Ief7a3f36413c76ec08e472a55204c75d76339039