| commit | a5af760efe51c94fb86a3a08c11a97068c14f66c | [log] [tgz] |
|---|---|---|
| author | Nicolas Geoffray <ngeoffray@google.com> | Wed May 06 23:47:53 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 06 23:47:53 2015 +0000 |
| tree | 25522d2c38c8a02232a2f7776efc5b4bcb7bb396 | |
| parent | 12f250bb7ef3ffbc8d9fa26b0b9da03467967012 [diff] | |
| parent | 07a1305927997fa944d4a3f65e45bdbeb16ac916 [diff] |
am 07a13059: am dceab011: Merge "Bump jdwp timeout to 12 minutes." * commit '07a1305927997fa944d4a3f65e45bdbeb16ac916': Bump jdwp timeout to 12 minutes.