Merge changes from topic 'adb_cmd_socket' am: 1f5a49f77a

am: db3c28f0d2

Change-Id: I7de10f76c56789ae48e72aaf49ce22d19328f76a
This commit is contained in:
Josh Gao 2016-09-02 01:11:47 +00:00 committed by android-build-merger
commit b71f6edf3a

Diff content is not available