Merge commit '99cf2c2ea56f74a1626daf535043d14b43e1862a' into dev-release

Change-Id: Icfbf7264b44ba092c8c263b30e8907c308dcb8c2

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..f860134 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.5.2-dev";
 
   private Version() {
   }