tree 9a5ce2947091180c4de9839f6882653a05b49a57
parent f60a65f8168b62a7ec6d05a440c95c9eb449f4a4
parent f9329b58dff31fda3c73d0bdcca99eee3fca2913
author bohu <bohu@google.com> 1486143465 +0000
committer android-build-merger <android-build-merger@google.com> 1486143465 +0000

Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43 am: 40f71feca4"
am: f9329b58df

Change-Id: Id036a652078559982dbe05c40e8400b1a500464b