commit e871182ef7dad82cbd95fd4f37c86701930c0190
author Elliott Hughes <enh@google.com> Sat Nov 07 17:07:43 2015 +0000
committer android-build-merger <android-build-merger@google.com> Sat Nov 07 17:07:43 2015 +0000
tree c744242fc5e502cc0c112971284cb7f1ef9944e4
parent 6657e1fde7379827ad5541df05e7c1f49d465b12
parent 2e093e74e536ee16cba9e78fc8744d373a0ce092

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

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