diff options
| author | Benoit Lamarche <benoitlamarche@google.com> | 2015-04-08 16:50:50 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-08 16:50:50 +0000 |
| commit | 6f89ab02620d018ede782861ed9fc1610276e400 (patch) | |
| tree | de4dde2095021b2d05d40b53efdf6cc4a3ff630a | |
| parent | d6fc93cd3552bb81a9e41767a7f64b83439509cd (diff) | |
| parent | 00d77c918847afb570a38adefc03e6272b63b0ab (diff) | |
| download | android_dalvik-6f89ab02620d018ede782861ed9fc1610276e400.tar.gz android_dalvik-6f89ab02620d018ede782861ed9fc1610276e400.tar.bz2 android_dalvik-6f89ab02620d018ede782861ed9fc1610276e400.zip | |
am 00d77c91: resolved conflicts for merge of 6be6ed44 to lmp-mr1-dev-plus-aosp
* commit '00d77c918847afb570a38adefc03e6272b63b0ab':
Support --num-threads with --multi-dex (take 2)
| -rw-r--r-- | dx/tests/128-multidex-option-overflow/expected.txt | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/dx/tests/128-multidex-option-overflow/expected.txt b/dx/tests/128-multidex-option-overflow/expected.txt index 3d7a649b8..ac448a63d 100644 --- a/dx/tests/128-multidex-option-overflow/expected.txt +++ b/dx/tests/128-multidex-option-overflow/expected.txt @@ -1,3 +1,2 @@ classes2.dex -classes3.dex classes.dex |