tree 47c2933c2b7b16cbe51cd29138434adbc0681e99
parent 5f865e594366a0c94d6907a6ee4c8e0aaa3d27bd
parent 9083ff1c24b9e84b9bca46de1fd4a86243e73103
author Josh Gao <jmgao@google.com> 1493941970 +0000
committer android-build-merger <android-build-merger@google.com> 1493941970 +0000

Merge changes from topic 'adb_thread_safety'
am: 9083ff1c24

Change-Id: I55e4d18648d3ceb915840ee5d25b2e8146a0bef6