tree 49e8d6b7d2612d322a9a919954b79fc3c575480c
parent 23b4a2b969faafaf76a41943569c04b9bfdf9ae5
parent 05b74436446144d39bfdbe3b215a8baf4be731ce
author Josh Gao <jmgao@google.com> 1493942369 +0000
committer android-build-merger <android-build-merger@google.com> 1493942369 +0000

Merge changes from topic 'adb_thread_safety' am: 9083ff1c24 am: 2ca23fa508
am: 05b7443644

Change-Id: I9732c77296edf0555083df146b0eb2d43ac66410