tree 142664967ff02347219bd117150b64a4e23652d8
parent 2dd504e044cfc869177db9fc28d358a93645480a
parent ea9359a957dfc7630b595622e853930c4b018ad4
author Josh Gao <jmgao@google.com> 1519434636 +0000
committer android-build-merger <android-build-merger@google.com> 1519434636 +0000

Merge "adb: switch apacket over to a std::string payload." am: 581a4ceb00 am: 4d74066425
am: ea9359a957

Change-Id: Ib9b1f7c9c3e59e3cfd3ea492360703d2b7a68119