diff options
| author | Tor Norbye <tnorbye@google.com> | 2015-08-03 12:49:39 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-08-03 12:49:39 +0000 |
| commit | 12908b012fcb4b1edbbc835393046ed9ae7dab9f (patch) | |
| tree | ece39896edbd80ef1227e2e25046095309d1c58c /android/src | |
| parent | 2dbbcff156026d1bf0e173d549ce54b8239a96cb (diff) | |
| parent | e48e3802e3ea3809866c9c675a03b157c259b3fc (diff) | |
| download | idea-12908b012fcb4b1edbbc835393046ed9ae7dab9f.tar.gz | |
Merge "resolve merge conflicts of aca158a to studio-1.4-dev." into studio-1.4-dev automerge: c828d49
automerge: e48e380
* commit 'e48e3802e3ea3809866c9c675a03b157c259b3fc':
Update version to 1.3 RC 4
Diffstat (limited to 'android/src')
| -rwxr-xr-x | android/src/META-INF/plugin.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/android/src/META-INF/plugin.xml b/android/src/META-INF/plugin.xml index fc48ec82bf8..b6e2ab1e71f 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.3 RC 3</version> + <version>10.1.4 Preview</version> <vendor>JetBrains</vendor> <depends>JUnit</depends> |