commit 5439083939024775cf5c512fa5603257846612c3
author Elliott Hughes <enh@google.com> Sat Nov 07 17:11:06 2015 +0000
committer android-build-merger <android-build-merger@google.com> Sat Nov 07 17:11:06 2015 +0000
tree 232408103128dfde2ec693e592e805c07dd66b65
parent 9877798d42f8b74b232066e4a1d6b0feae8a4092
parent e871182ef7dad82cbd95fd4f37c86701930c0190

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

* commit 'b31710e7d4ad7c682f1a5d27f7c8eddff5868a44':
  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).