tree 28acc83581104bca1b6d26c6d311ca2c5b898d8b
parent df3b28c002e0512b15378beb99a51b8de0de10f3
parent db3c28f0d2012b01e73bac1399cc19c826f8e713
author Josh Gao <jmgao@google.com> 1472778707 +0000
committer android-build-merger <android-build-merger@google.com> 1472778707 +0000

Merge changes from topic 'adb_cmd_socket' am: 1f5a49f77a
am: db3c28f0d2

Change-Id: I7de10f76c56789ae48e72aaf49ce22d19328f76a