diff options
| author | Benoit Lamarche <benoitlamarche@google.com> | 2014-12-19 14:43:14 +0100 |
|---|---|---|
| committer | Benoit Lamarche <benoitlamarche@google.com> | 2014-12-19 14:44:25 +0100 |
| commit | 16bf8d51a5f4a9aa5a6a72268faa7d798e4db505 (patch) | |
| tree | 79046371112bd8ff2f8f8ce1302505362532afe4 /dx-ref | |
| parent | 54c574eddcd419fff6aaae5ee52fd02d9973829e (diff) | |
| download | toolchain_jack-16bf8d51a5f4a9aa5a6a72268faa7d798e4db505.tar.gz toolchain_jack-16bf8d51a5f4a9aa5a6a72268faa7d798e4db505.tar.bz2 toolchain_jack-16bf8d51a5f4a9aa5a6a72268faa7d798e4db505.zip | |
Update dx-ref to get rid of "already prepared" errors
Bug: 18486731
Change-Id: I67359394597c03a8b81fc05e62ae19fed325d806
Diffstat (limited to 'dx-ref')
| -rw-r--r-- | dx-ref/README.txt | 12 | ||||
| -rw-r--r-- | dx-ref/dx.jar | bin | 958047 -> 963559 bytes |
2 files changed, 6 insertions, 6 deletions
diff --git a/dx-ref/README.txt b/dx-ref/README.txt index 62196651..da96e9d4 100644 --- a/dx-ref/README.txt +++ b/dx-ref/README.txt @@ -1,9 +1,9 @@ -latest commit in jack-wip-dev for dalvik project: +latest commit in aosp-master for dalvik project: -commit 68f077763234a531482b78534d6c6a75412800bc -Merge: 858dfec 21e30d9 -Author: The Android Automerger <android-build@android.com> -Date: Wed May 8 05:55:15 2013 -0700 +commit e2808cf44a08f7e39163f79c9483c17602f58266 +Merge: c954851 bb404aa +Author: Benoit Lamarche <benoitlamarche@google.com> +Date: Fri Dec 19 09:46:22 2014 +0000 - merge in jb-mr2-release history after reset to jb-mr2-dev + Merge "Do not keep the DexFile field in Main between runs" diff --git a/dx-ref/dx.jar b/dx-ref/dx.jar Binary files differindex 0ff9b8c6..5039f308 100644 --- a/dx-ref/dx.jar +++ b/dx-ref/dx.jar |