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:32:02 +0000 (19:32 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 17 Mar 2017 19:32:02 +0000 (19:32 +0000)
am: 738015f0e4

Change-Id: I370de8a5d9660db6c2e92332a6da182a561cd603


Trivial merge