diff options
| author | Vladimir Marko <vmarko@google.com> | 2016-04-07 12:23:34 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-04-07 12:23:34 +0000 |
| commit | e85230af78dc3e803080c6138b2bb683bfb35d49 (patch) | |
| tree | cb1580a731298b82412bf3c663b31a4b2ce409ec /test/MultiDexModifiedSecondary/main.jpp | |
| parent | b8b16596c3524f2ac2e791151468162b8aca74d6 (diff) | |
| parent | 522354b3f7c76970eb37be50836b8473e301286c (diff) | |
Merge "Add 20s timeout to 570-checker-osr." am: 748ad81
am: 522354b
* commit '522354b3f7c76970eb37be50836b8473e301286c':
Add 20s timeout to 570-checker-osr.
Change-Id: I282bd15ba2465c5225933a22ebdcce4094bd36ea
Diffstat (limited to 'test/MultiDexModifiedSecondary/main.jpp')
0 files changed, 0 insertions, 0 deletions