OSDN Git Service

Merge "Abort using SIGABRT instead of SIGKILL on command_timeout" am: 379743d738
authorAndre Eisenbach <eisenbach@google.com>
Fri, 17 Mar 2017 19:28:36 +0000 (19:28 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 17 Mar 2017 19:28:36 +0000 (19:28 +0000)
am: 7c779ec3a2

Change-Id: I22f28b067828c675ebbfbb98929c8b53be96c598


Trivial merge