diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2015-05-07 00:03:49 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-05-07 00:03:49 +0000 |
| commit | d3ce1a00ecfc9293c6210d8695b6f4a4d937ecc3 (patch) | |
| tree | 25522d2c38c8a02232a2f7776efc5b4bcb7bb396 /test/MultiDexModifiedSecondary/Main.java | |
| parent | aa673c90dbcafbe09065975e7e0fe326b2443c9e (diff) | |
| parent | a5af760efe51c94fb86a3a08c11a97068c14f66c (diff) | |
am a5af760e: am 07a13059: am dceab011: Merge "Bump jdwp timeout to 12 minutes."
* commit 'a5af760efe51c94fb86a3a08c11a97068c14f66c':
Bump jdwp timeout to 12 minutes.
Diffstat (limited to 'test/MultiDexModifiedSecondary/Main.java')
0 files changed, 0 insertions, 0 deletions