tree ce59d5d1d33d6b78806bcfc753b5991910b05c5f
parent 2abb5f879c939577f9e73d1792c596ca10cf4326
parent 5d6593c5f76afac980e3ed5f03d23775d40691b8
author Josh Gao <jmgao@google.com> 1492201388 +0000
committer android-build-merger <android-build-merger@google.com> 1492201388 +0000

Merge changes from topics 'adb_thread', 'adb_loopback' am: 0301b3217b am: 750dfee974 am: da1f886ed8
am: 5d6593c5f7

Change-Id: I9f95633015ec7194b4bab54a0626ab99d90504ee