Merge branch 'google3' to roll forward up to cl/351480628.

This commit is contained in:
hai007
2021-01-12 17:18:20 -08:00
+3
View File
@@ -35,6 +35,9 @@ namespace connections {
using ::location::nearby::proto::connections::ConnectionAttemptResult;
using ::location::nearby::proto::connections::DisconnectionReason;
// Required for C++ 14 support in Chrome
constexpr absl::Duration BwuManager::kReadClientIntroductionFrameTimeout;
BwuManager::BwuManager(
Mediums& mediums, EndpointManager& endpoint_manager,
EndpointChannelManager& channel_manager,