summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Norbye <tnorbye@google.com>2015-04-27 07:34:30 -0700
committerTor Norbye <tnorbye@google.com>2015-04-28 17:48:15 +0000
commitbc7e6fbf5bd1c290afd9022fd7a8ddb634e2dca5 (patch)
tree11a4509b544f3bdb1e18a9e2f2472559c7e7c631
parent24b985496a598722375380965a5b872dfa200cc3 (diff)
downloadidea-bc7e6fbf5bd1c290afd9022fd7a8ddb634e2dca5.tar.gz
Update version to 1.2
Change-Id: I2c218703d8692367aa360de7a2317e1112fc5622 (cherry picked from commit e096136209810f6e6e203d9e11bd989419a35e81)
-rwxr-xr-xadt-branding/src/idea/AndroidStudioApplicationInfo.xml2
-rwxr-xr-xandroid/src/META-INF/plugin.xml2
2 files changed, 2 insertions, 2 deletions
diff --git a/adt-branding/src/idea/AndroidStudioApplicationInfo.xml b/adt-branding/src/idea/AndroidStudioApplicationInfo.xml
index 4e0d1a86012..a3257a053a6 100755
--- a/adt-branding/src/idea/AndroidStudioApplicationInfo.xml
+++ b/adt-branding/src/idea/AndroidStudioApplicationInfo.xml
@@ -14,7 +14,7 @@
~ limitations under the License.
-->
<component>
- <version major="1" minor="2" micro="0" patch="11" full="{0}.{1} RC 3" eap="false" />
+ <version major="1" minor="2" micro="0" patch="12" full="{0}.{1}" eap="false" />
<company name="Google" url="http://developer.android.com"/>
<build number="__BUILD_NUMBER__" date="__BUILD_DATE__" apiVersion="141.178"/>
<install-over minbuild="0.1" maxbuild="999.999999" version="0"/>
diff --git a/android/src/META-INF/plugin.xml b/android/src/META-INF/plugin.xml
index 93536589bff..0f141f10d08 100755
--- a/android/src/META-INF/plugin.xml
+++ b/android/src/META-INF/plugin.xml
@@ -4,7 +4,7 @@
<description>
Supports the development of Open Handset Alliance Android applications with IntelliJ IDEA.
</description>
- <version>10.1.2 RC 3</version>
+ <version>10.1.2</version>
<vendor>JetBrains</vendor>
<depends>JUnit</depends>