tree 9a5ce2947091180c4de9839f6882653a05b49a57
parent b84c9d675ab3d878f0c96362dcb6deb06af58d8d
parent 1291cc7fa98c3b6fb2315a52256fde855c4c38d4
author Android Build Merger (Role) <android-build-merger@google.com> 1486143916 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1486143918 +0000

Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43 am: 4b6d85e98c am: 6dd1ce66c9 am: 546530a93b am: 1919b19cbe" into nyc-mr1-dev-plus-aosp