tree 9a5ce2947091180c4de9839f6882653a05b49a57
parent d1b373f42ea3c6e11e052600b5e858aaf701ebf8
parent 4771c1e74a40ece10ded776f1adcc4973a451023
author Android Build Merger (Role) <android-build-merger@google.com> 1486144089 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1486144090 +0000

Merge "Merge "CTS: skip wifi related net test if no such feature am: 2fa6e7ce43" into nougat-mr1-cts-dev am: 266d07f3cb am: b2435d99d4 am: 462d211655" into nyc-mr1-dev-plus-aosp