OSDN Git Service

am b560d884: am 2e3fc781: Merge "Use trap + async timeout for tests"
authorMathieu Chartier <mathieuc@google.com>
Wed, 8 Jul 2015 21:54:49 +0000 (21:54 +0000)
committerAndroid 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