commit e3a23d63e2cbb98b5df159a87ba8330be71694c8
author David Pursell <dpursell@google.com> Tue Dec 08 16:22:44 2015 +0000
committer android-build-merger <android-build-merger@google.com> Tue Dec 08 16:22:44 2015 +0000
tree 45e07a2194d710ee0a8f8d9cb2af388d01c13dc6
parent 124113b0aa781efadd81f627f7af8bdd7e706f20
parent 1effd452ab94b290d6756dced8c0ddb918d81561

Merge "adb: add help text for USB permission errors." am: aafa096090 am: e37325defc
am: 1effd452ab

* commit '1effd452ab94b290d6756dced8c0ddb918d81561':
  adb: add help text for USB permission errors.

transport.cpp

diff --git a/transport.cpp b/transport.cpp
index d4f60ec..988007d 100644
--- a/transport.cpp
+++ b/transport.cpp
@@ -792,9 +792,7 @@
     // Local static allocation to avoid global non-POD variables.
     static const FeatureSet* features = new FeatureSet{
         kFeatureShell2,
-        // Internal master has 'cmd'. AOSP master doesn't.
-        // kFeatureCmd
-
+        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).