summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenoit Lamarche <benoitlamarche@google.com>2015-04-08 15:46:48 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-04-08 15:46:49 +0000
commit010ac9716931a47686e3f818910102a1231d32c0 (patch)
tree80be009022f38a4b426c093044cc2c3228281da0
parent7b153a1d75a3f51d38e5742df142f58a82f14fe3 (diff)
parentb3ee08c03a18918258caa15275128262387da87c (diff)
downloadandroid_dalvik-010ac9716931a47686e3f818910102a1231d32c0.tar.gz
android_dalvik-010ac9716931a47686e3f818910102a1231d32c0.tar.bz2
android_dalvik-010ac9716931a47686e3f818910102a1231d32c0.zip
Merge "Bump dx version to 1.11" into lmp-mr1-dev
-rw-r--r--dx/src/com/android/dx/Version.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/dx/src/com/android/dx/Version.java b/dx/src/com/android/dx/Version.java
index 5f02e47d4..1e15d5567 100644
--- a/dx/src/com/android/dx/Version.java
+++ b/dx/src/com/android/dx/Version.java
@@ -21,5 +21,5 @@ package com.android.dx;
*/
public class Version {
/** {@code non-null;} version string */
- public static final String VERSION = "1.10";
+ public static final String VERSION = "1.11";
}