Merge cherrypicks of [19758235, 20064237] into studio-ee-release.
Change-Id: Ifad4555474e39e41a4ca1ed8747deb47af7da8b5
diff --git a/android-plugin/src/META-INF/plugin.xml b/android-plugin/src/META-INF/plugin.xml
index 1a6e4a6..f0ba48f 100755
--- a/android-plugin/src/META-INF/plugin.xml
+++ b/android-plugin/src/META-INF/plugin.xml
@@ -7,7 +7,7 @@
]]>
</description>
<category>Android</category>
- <version>dev build</version>
+ <version>2022.1.1 Beta 2</version>
<vendor>JetBrains, Google</vendor>
<depends>com.intellij.platform.images</depends>
<depends>com.intellij.modules.java</depends>
@@ -57,4 +57,4 @@
<xi:include href="/META-INF/device-manager.xml" xpointer="xpointer(/idea-plugin/*)"/>
<xi:include href="/META-INF/threading-checker.xml" xpointer="xpointer(/idea-plugin/*)"/>
<xi:include href="/META-INF/wear-pairing.xml" xpointer="xpointer(/idea-plugin/*)"/>
-</idea-plugin>
\ No newline at end of file
+</idea-plugin>
diff --git a/studio/BUILD b/studio/BUILD
index 4a8bf0a..854b120 100644
--- a/studio/BUILD
+++ b/studio/BUILD
@@ -591,10 +591,10 @@
],
searchable_options = "//tools/adt/idea/searchable-options",
version_code_name = "Electric Eel",
- version_micro_patch = "1.11",
+ version_micro_patch = "1.12",
# This will get added to the end of the full-version string.
# TODO(b/240707039): automate this.
- version_release_number = 1,
+ version_release_number = 2,
version_type = "Beta",
# version_update_message = "<html>this is optional</html>",
visibility = ["//visibility:public"],
