commit 0bf0146c57ef9483c54e1c239875d3ff90b46dff
author Tor Norbye <tnorbye@google.com> Tue Apr 28 17:48:31 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Apr 28 17:48:32 2015 +0000
tree 11a4509b544f3bdb1e18a9e2f2472559c7e7c631
parent 24b985496a598722375380965a5b872dfa200cc3
parent bc7e6fbf5bd1c290afd9022fd7a8ddb634e2dca5

Merge "Update version to 1.2" into studio-1.2-release

adt-branding/src/idea/AndroidStudioApplicationInfo.xml

diff --git a/adt-branding/src/idea/AndroidStudioApplicationInfo.xml b/adt-branding/src/idea/AndroidStudioApplicationInfo.xml
index 4e0d1a8..a3257a0 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"/>

android/src/META-INF/plugin.xml

diff --git a/android/src/META-INF/plugin.xml b/android/src/META-INF/plugin.xml
index 9353658..0f141f1 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>