Merge commit 'f6a533d424161b8b606a6e54e01582005dda7766' into dev-release

Change-Id: I707a2ff8fb224417568bf634bf0d4483447eb68b

src/main/java/com/android/tools/r8/Version.java

diff --git a/src/main/java/com/android/tools/r8/Version.java b/src/main/java/com/android/tools/r8/Version.java
index b725385..54e80a6 100644
--- a/src/main/java/com/android/tools/r8/Version.java
+++ b/src/main/java/com/android/tools/r8/Version.java
@@ -13,7 +13,7 @@
 
   // This field is accessed from release scripts using simple pattern matching.
   // Therefore, changing this field could break our release scripts.
-  public static final String LABEL = "main";
+  public static final String LABEL = "8.4.0-dev";
 
   private Version() {
   }