OSDN Git Service

[automerger skipped] If command_timed_out() is triggered don't get blocked by a deadlock
authorPavlin Radoslavov <pavlin@google.com>
Wed, 27 Jun 2018 19:49:52 +0000 (12:49 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 27 Jun 2018 19:49:52 +0000 (12:49 -0700)
am: 14cb1ba6d6  -s ours

Change-Id: I4e5083dc37f4d7f58bd52913d6765c86bd8fd100


Trivial merge