merge in nyc-release history after reset to master
diff --git a/buffet/shill_client.h b/buffet/shill_client.h
index 015db7b..0499707 100644
--- a/buffet/shill_client.h
+++ b/buffet/shill_client.h
@@ -56,6 +56,10 @@
                const weave::DoneCallback& callback) override;
   void StartAccessPoint(const std::string& ssid) override;
   void StopAccessPoint() override;
+  bool IsWifi24Supported() const override { return true; }
+  // TODO(avakulenko): See if we can get appropriate information from Shill
+  // regarding 5.0 GHz support.
+  bool IsWifi50Supported() const override { return false; }
 
  private:
   struct DeviceState {