commit a11f444e7dc928320302e21a912c31fa62f2bd53
author Josh Gao <jmgao@google.com> Thu Nov 12 23:12:24 2015 +0000
committer android-build-merger <android-build-merger@google.com> Thu Nov 12 23:12:24 2015 +0000
tree d9e9162481093f3c8068ec7d6c3dff53d0920519
parent 2a510395ee46dd1ea5134d98df67560e74bc69c1
parent ac9a78090498f3e75bd0c25064a90f6eb3dc496b

Merge changes Ic124ecb9,I94de55d2 am: ac9a780904 am: 9a3f299ec0
am: 33bc6f38e7

* commit '33bc6f38e7946108ff2fba947e2a2be0c8d62d7f':
  libbase: remove exit-time destructors.
  adb: remove exit-time destructors.

transport.cpp

diff --git a/transport.cpp b/transport.cpp
index 2f18f20..8b0cb38 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).