commit f1a58f8f33509201cabe71c6a9d01aa6b8f99966
author Elliott Hughes <enh@google.com> Wed Apr 29 12:28:13 2015 -0700
committer Elliott Hughes <enh@google.com> Thu Apr 30 12:31:11 2015 -0700
tree f14e44638d2fdfde84b8a576c719fce757b96cf2
parent 0156589846117bccb2fbec6b3141cc21bc86c638

More fixed-length buffer removal.

Bug: http://b/20666660
Change-Id: I0c738e9fed2defed48a9cf2d0a4f7b99c08dcf3d
(cherry picked from commit 6452a89aa8934231e12ab77e0d90f12c3e892ad1)

adb/transport.cpp

diff --git a/adb/transport.cpp b/adb/transport.cpp
index d395a80..45740a8 100644
--- a/adb/transport.cpp
+++ b/adb/transport.cpp
@@ -847,7 +847,7 @@
                 result = t;
             } else if (ttype == kTransportAny) {
                 if (result) {
-                    if (error_out) *error_out = "more than one device and emulator";
+                    if (error_out) *error_out = "more than one device/emulator";
                     ambiguous = 1;
                     result = NULL;
                     break;