OSDN Git Service
(root)
/
android-x86
/
system-bt.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6f8daa5
14cb1ba
)
[automerger skipped] If command_timed_out() is triggered don't get blocked by a deadlock
author
Pavlin Radoslavov
<pavlin@google.com>
Wed, 27 Jun 2018 19:49:52 +0000
(12:49 -0700)
committer
android-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