tree 81835b5d4737e5ff372cc59fd3823638138c0889
parent 38a6674924b63566c61a5e4a2c72777b896a1173
parent 7ce813a6129ab0c0b812b27e332730a8a2165d43
author Ningyuan Wang <nywang@google.com> 1507145371 +0000
committer android-build-merger <android-build-merger@google.com> 1507145371 +0000

Merge "Fail scan request if no channels are available" into oc-mr1-dev
am: 7ce813a612

Change-Id: I48fa59e26cd5bf5ced0bf92a655fc04f4295d39f