OSDN Git Service
(root)
/
android-x86
/
art.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
39ca1d8
b560d88
)
am b560d884: am 2e3fc781: Merge "Use trap + async timeout for tests"
author
Mathieu Chartier
<mathieuc@google.com>
Wed, 8 Jul 2015 21:54:49 +0000
(21:54 +0000)
committer
Android Git Automerger
<android-git-automerger@android.com>
Wed, 8 Jul 2015 21:54:49 +0000
(21:54 +0000)
* commit '
b560d884c76ba83dbdeea814770c9aa71255e279
':
Use trap + async timeout for tests
Trivial merge