Merge "Add missing ',' in default jdwp argument list"
diff --git a/adbconnection/adbconnection.cc b/adbconnection/adbconnection.cc
index d399c2a..ad94148 100644
--- a/adbconnection/adbconnection.cc
+++ b/adbconnection/adbconnection.cc
@@ -872,7 +872,7 @@
(ContainsArgument(opts, "server=y") ? "" : "server=y,") +
// See the comment above for why we need to be suspend=n. Since the agent defaults to
// suspend=y we will add it if it wasn't already present.
- (ContainsArgument(opts, "suspend=n") ? "" : "suspend=n") +
+ (ContainsArgument(opts, "suspend=n") ? "" : "suspend=n,") +
"transport=dt_fd_forward,address=" + std::to_string(remote_agent_control_sock_);
}