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