commit 51251bb7b85e9d204965670ce10fca35a924be79
author Elliott Hughes <enh@google.com> Mon Dec 07 23:59:44 2015 +0000
committer android-build-merger <android-build-merger@google.com> Mon Dec 07 23:59:44 2015 +0000
tree 0b016a65aa9931b35161fc5af134dd3fb41aab54
parent abed6edc4d35b45801f593668473e94a8cbe885c
parent 047db5285179873e1e841b69fd6321a96b265d98

Merge "Track rename of base/ to android-base/." am: 316a0dd842 am: e2a9563be1
am: 047db52851

* commit '047db5285179873e1e841b69fd6321a96b265d98':
  Track rename of base/ to android-base/.

transport.cpp

diff --git a/transport.cpp b/transport.cpp
index d20eaff..b32c86a 100644
--- a/transport.cpp
+++ b/transport.cpp
@@ -785,9 +785,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).