diff options
| author | Esteban de la Canal <estebandlc@google.com> | 2015-01-14 16:00:53 -0800 |
|---|---|---|
| committer | Esteban de la Canal <estebandlc@google.com> | 2015-01-14 16:00:53 -0800 |
| commit | 984db126422c57a53571d357fff2bd26807bd8d9 (patch) | |
| tree | 5bcabdd610ab34b3534107f89b9fe856b5c5b5bd /adt-branding | |
| parent | ef7b4920cd2be8710116dd7c1f17fe53a6975f70 (diff) | |
| parent | b201303528b10147f75de465e2898dc12996924c (diff) | |
| download | idea-984db126422c57a53571d357fff2bd26807bd8d9.tar.gz | |
resolve merge conflicts of b201303 to studio-1.2-dev.
Change-Id: I125105a66bdbd81bd68671ce9543504edf72fde7
Diffstat (limited to 'adt-branding')
| -rwxr-xr-x | adt-branding/src/idea/AndroidStudioApplicationInfo.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/adt-branding/src/idea/AndroidStudioApplicationInfo.xml b/adt-branding/src/idea/AndroidStudioApplicationInfo.xml index 21c9edd61eb..5040a4cb49a 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 Preview 1" eap="true" /> + <version major="1" minor="2 Preview 1" strict="1.2.0a1" eap="true" /> <company name="Google Inc." url="http://developer.android.com"/> <build number="__BUILD_NUMBER__" date="__BUILD_DATE__" apiVersion="139.791"/> <install-over minbuild="0.1" maxbuild="999.999999" version="0"/> |