commit 165ee9e8361957c76f152408b1ee43002c494d32
author Elliott Hughes <enh@google.com> Sat Nov 07 17:14:10 2015 +0000
committer android-build-merger <android-build-merger@google.com> Sat Nov 07 17:14:10 2015 +0000
tree d98c795e589a7ebe799ed5b0ec498604693b76e6
parent c5836b5392d7e6235b3f962cce277d72749d47c3
parent 5439083939024775cf5c512fa5603257846612c3

Merge "AOSP master doesn\'t have "cmd"." am: 54b5e85373 am: b31710e7d4
am: 8f9c7c33c5

* commit '8f9c7c33c5ae96719500cb4ae525d3dfd0d1e798':
  AOSP master doesn't have "cmd".

adb/transport.cpp

diff --git a/adb/transport.cpp b/adb/transport.cpp
index ad607e9..9d50854 100644
--- a/adb/transport.cpp
+++ b/adb/transport.cpp
@@ -784,7 +784,9 @@
     // Local static allocation to avoid global non-POD variables.
     static const FeatureSet* features = new FeatureSet{
         kFeatureShell2,
-        kFeatureCmd
+        // Internal master has 'cmd'. AOSP master doesn't.
+        // kFeatureCmd
+
         // Increment ADB_SERVER_VERSION whenever the feature list changes to
         // make sure that the adb client and server features stay in sync
         // (http://b/24370690).