diff options
| author | Benoit Lamarche <benoitlamarche@google.com> | 2015-04-08 16:50:51 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-08 16:50:51 +0000 |
| commit | 997e6db9ae676da19e595701437bca36b0089818 (patch) | |
| tree | 9f954d1838fee56625603f09cd0e93c011c32d4c | |
| parent | 6f89ab02620d018ede782861ed9fc1610276e400 (diff) | |
| parent | 1d40d9ea62b8c37cf904108ae886bfba5dac0d84 (diff) | |
| download | android_dalvik-997e6db9ae676da19e595701437bca36b0089818.tar.gz android_dalvik-997e6db9ae676da19e595701437bca36b0089818.tar.bz2 android_dalvik-997e6db9ae676da19e595701437bca36b0089818.zip | |
am 1d40d9ea: am 7b153a1d: Merge "Fix potential dex index overflow in dx" into lmp-mr1-dev
* commit '1d40d9ea62b8c37cf904108ae886bfba5dac0d84':
Fix potential dex index overflow in dx
| -rw-r--r-- | dx/tests/128-multidex-option-overflow/expected.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/dx/tests/128-multidex-option-overflow/expected.txt b/dx/tests/128-multidex-option-overflow/expected.txt index ac448a63d..3d7a649b8 100644 --- a/dx/tests/128-multidex-option-overflow/expected.txt +++ b/dx/tests/128-multidex-option-overflow/expected.txt @@ -1,2 +1,3 @@ classes2.dex +classes3.dex classes.dex |