diff options
| author | Tor Norbye <tnorbye@google.com> | 2015-04-24 17:57:17 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-24 17:57:17 +0000 |
| commit | 64f3777819975d52f5fc79dfc9b3f1d0683ffbef (patch) | |
| tree | 77aa8c40ecdcc7ef3b60da58c1428df1906a8c51 | |
| parent | 8a4fcc821a05063b0227682e414af8ddcf1aa1fd (diff) | |
| parent | f4c6c6950ea258e4c6b3285468e19a3fb8c7b5f6 (diff) | |
| download | idea-64f3777819975d52f5fc79dfc9b3f1d0683ffbef.tar.gz | |
am f4c6c695: am c78f83da: Merge "Update version to 1.2 RC 3" into studio-1.2-dev automerge: 8577cb9 automerge: 8f2c0a5 automerge: 87fb71c
* commit 'f4c6c6950ea258e4c6b3285468e19a3fb8c7b5f6':
Update version to 1.2 RC 3
| -rwxr-xr-x | adt-branding/src/idea/AndroidStudioApplicationInfo.xml | 2 | ||||
| -rwxr-xr-x | android/src/META-INF/plugin.xml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/adt-branding/src/idea/AndroidStudioApplicationInfo.xml b/adt-branding/src/idea/AndroidStudioApplicationInfo.xml index 0a091a41e68..89a30bd878b 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="10" full="{0}.{1} RC 2" eap="false" /> + <version major="1" minor="2" micro="0" patch="11" full="{0}.{1} RC 3" eap="false" /> <company name="Google" url="http://developer.android.com"/> <build number="__BUILD_NUMBER__" date="__BUILD_DATE__" apiVersion="141.498"/> <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 44a137452f9..6c692167eb0 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 2</version> + <version>10.1.2 RC 3</version> <vendor>JetBrains</vendor> <depends>JUnit</depends> |