tree 2add69fe35ff6f0fe03ec27baf301a6d223902a6
parent e75f43461dc085099459962cf97648a82c89d4f1
parent 16bbf3b4cdc36c7132ce2b5a121aa732e7788316
author Josh Gao <jmgao@google.com> 1518068239 +0000
committer android-build-merger <android-build-merger@google.com> 1518068239 +0000

Merge "adb: switch asocket::enqueue to std::string." am: 9bf624cd3a am: e523a6c94f
am: 16bbf3b4cd

Change-Id: Ie46218fe0fff30999f1ca40c509bb7e27fe2cb42