tree 39edf12da8a2d01d0a7329a6c7ba1f683affa3b3
parent a77792a2b74b2a3a43c7cec873a037a012c85233
parent 3187510b17f7eeeb67286a4a842abd503906bb5c
author Josh Gao <jmgao@google.com> 1492200492 +0000
committer android-build-merger <android-build-merger@google.com> 1492200492 +0000

Merge changes from topics 'adb_thread', 'adb_loopback'
am: 3187510b17

Change-Id: I18578729590be59de526dbda364627b28503a092