Merge changes from topic 'adb_cmd_socket'

am: 1f5a49f77a

Change-Id: I81b1e8e7d23f40fd82707f7744c197e25378efb6
This commit is contained in:
Josh Gao 2016-09-02 01:08:46 +00:00 committed by android-build-merger
commit db3c28f0d2

Diff content is not available