diff options
| author | Mikael Peltier <mikaelpeltier@google.com> | 2017-05-11 08:54:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-05-11 08:54:51 +0000 |
| commit | 7ed62ebc90c1d8f34bee24533b15c4cbd7dfd0af (patch) | |
| tree | 9f6c2b858c1aeadf263d6b52ded8ec90848e629a | |
| parent | 7a7e3d881ef8c808f58e1ab4ca3176f32ffc22b7 (diff) | |
| parent | 7124c1aebf51291c0c3e3ee35fe72ebc7b9bf930 (diff) | |
| download | jack-7ed62ebc90c1d8f34bee24533b15c4cbd7dfd0af.tar.gz | |
Merge "Update Desugar" into ub-jack
| -rw-r--r-- | jack-tests/README.android | 4 | ||||
| -rwxr-xr-x | jack-tests/prebuilts/desugar.jar | bin | 4497372 -> 2733321 bytes |
2 files changed, 2 insertions, 2 deletions
diff --git a/jack-tests/README.android b/jack-tests/README.android index c082c58ff..b03c3fbaf 100644 --- a/jack-tests/README.android +++ b/jack-tests/README.android @@ -33,6 +33,6 @@ http://archive.apache.org/dist/ant/source/apache-ant-1.9.6-src.zip https://sourceforge.net/projects/proguard/files/proguard/5.3/proguard5.3.2.zip/download * Desugar, as a prebuilt jar for jack-tests -Build from AOSP -commit 0b3c15f840b5f81fe86a5fa04e356855d89626c7 +Build from studio-master-weekly +commit c3cd78a2f91dca65263ad26f5598304581d0e6eb diff --git a/jack-tests/prebuilts/desugar.jar b/jack-tests/prebuilts/desugar.jar Binary files differindex 63b5ec87f..01fd960e7 100755 --- a/jack-tests/prebuilts/desugar.jar +++ b/jack-tests/prebuilts/desugar.jar |