tree c36fcab0cffe6889184e1d5c1422bc207023ac62
parent 9cce14f56a59bbce52254ffc50ea6817fd94d8dd
parent 472b00c0b39f9b95625bc50f394433fc06b31460
author Nicolas Geoffray <ngeoffray@google.com> 1430920943 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1430920944 +0000

Merge "Bump jdwp timeout to 12 minutes."