tree 31fd04714ca54e2eff176d1ac48011ff1b92d7c5
parent af9c8fa600d334bfdcc2ec666d615efaf9099f84
parent 186d91aacc54a2ffe70b3bd94caf37de0310bea5
author Android Build Merger (Role) <android-build-merger@google.com> 1498006209 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1498006212 +0000

Merge "Merge "cts: skip wifi related tests if wifi is unsupported" into oc-dev am: 73a81b18cd am: 5383b735d5" into oc-dr1-dev-plus-aosp