| commit | 1533ea61194012e6a1c81cfb121fe81cf61d9e3d | [log] [tgz] |
|---|---|---|
| author | Mathieu Chartier <mathieuc@google.com> | Wed Jul 08 21:54:49 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 08 21:54:49 2015 +0000 |
| tree | 32f54d4592ccfa7cc344c30bc0548f7e6264544d | |
| parent | 39ca1d88efe0e18cd80e77138dc8eb9ab552be2d [diff] | |
| parent | b560d884c76ba83dbdeea814770c9aa71255e279 [diff] |
am b560d884: am 2e3fc781: Merge "Use trap + async timeout for tests" * commit 'b560d884c76ba83dbdeea814770c9aa71255e279': Use trap + async timeout for tests