| commit | 07a1305927997fa944d4a3f65e45bdbeb16ac916 | [log] [tgz] |
|---|---|---|
| author | Nicolas Geoffray <ngeoffray@google.com> | Wed May 06 14:08:42 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 06 14:08:42 2015 +0000 |
| tree | c36fcab0cffe6889184e1d5c1422bc207023ac62 | |
| parent | b1c02d374ba8acab72a35c43b1e2e700ce0de8a3 [diff] | |
| parent | dceab011395333520959cf743d680bcf5dc78797 [diff] |
am dceab011: Merge "Bump jdwp timeout to 12 minutes." * commit 'dceab011395333520959cf743d680bcf5dc78797': Bump jdwp timeout to 12 minutes.