diff options
| author | Tor Norbye <tnorbye@google.com> | 2014-12-18 17:51:20 -0800 |
|---|---|---|
| committer | Tor Norbye <tnorbye@google.com> | 2014-12-18 17:51:20 -0800 |
| commit | aa5cef16e894232f20f756a34d4640cfcc6d15bd (patch) | |
| tree | 6a4c2e2b92ed76eff8d6a02232f04ddfd27b6783 /adt-branding | |
| parent | eccf64fa3e97c3c3ec10e96f85680f1d84ea0967 (diff) | |
| parent | 134b8e1927419459a890f2bfe1ab7f8a3e0597ad (diff) | |
| download | idea-aa5cef16e894232f20f756a34d4640cfcc6d15bd.tar.gz | |
Merge remote-tracking branch 'aosp/upstream-master' into merge-upstream
Conflicts:
adt-branding/src/idea/AndroidStudioApplicationInfo.xml
android/android.iml
android/guiTestSrc/com/android/tools/idea/tests/gui/framework/GuiTestCase.java
android/guiTestSrc/com/android/tools/idea/tests/gui/framework/fixture/ExecutionToolWindowFixture.java
android/guiTestSrc/com/android/tools/idea/tests/gui/gradle/GradleSyncTest.java
android/lib/builder-model-0.14.0.jar
android/lib/builder-model-1.0.0.jar
android/lib/builder-model-1.1.0-rc1.jar
android/lib/src/builder-model-1.0.0-sources.jar
android/src/META-INF/plugin.xml
android/src/com/android/tools/idea/gradle/project/AndroidGradleProjectResolver.java
android/src/com/android/tools/idea/gradle/service/notification/errors/OutdatedAppEngineGradlePluginErrorHandler.java
android/src/com/android/tools/idea/gradle/service/notification/hyperlink/CreateGradleWrapperHyperlink.java
android/src/com/android/tools/idea/gradle/service/notification/hyperlink/StopGradleDaemonsHyperlink.java
android/src/com/android/tools/idea/gradle/service/notification/hyperlink/UpgradeAppenginePluginVersionHyperlink.java
android/src/com/android/tools/idea/gradle/util/GradleUtil.java
android/src/com/android/tools/idea/sdk/DefaultSdks.java
android/src/com/android/tools/idea/sdk/VersionCheck.java
android/src/com/android/tools/idea/welcome/AndroidVirtualDevice.java
android/src/com/android/tools/idea/welcome/FirstRunWizardMode.java
android/src/com/android/tools/idea/welcome/InstallComponentsPath.java
android/testData/guiTests/OutdatedAppEnginePlugin/backend/build.gradle
android/testSrc/com/android/tools/idea/gradle/parser/GradleBuildFileTest.java
android/testSrc/com/android/tools/idea/welcome/AndroidVirtualDeviceTest.java
android/testSrc/com/android/tools/idea/welcome/FirstRunWizardTest.java
native/WinLauncher/out/Release-Win32/studio.exe
native/WinLauncher/out/Release-x64/studio64.exe
native/WinLauncher/studio_splash.bmp
Change-Id: Ia2021a49d2740cd69338b157f770c029ee686d5f
Diffstat (limited to 'adt-branding')
| -rwxr-xr-x | adt-branding/src/idea/AndroidStudioApplicationInfo.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/adt-branding/src/idea/AndroidStudioApplicationInfo.xml b/adt-branding/src/idea/AndroidStudioApplicationInfo.xml index ede413fdaa5..95c9215ca96 100755 --- a/adt-branding/src/idea/AndroidStudioApplicationInfo.xml +++ b/adt-branding/src/idea/AndroidStudioApplicationInfo.xml @@ -14,9 +14,9 @@ ~ limitations under the License. --> <component> - <version codename="Preview" major="1" minor="1.0" eap="true" /> + <version codename="Preview" major="1" minor="2.0" eap="true" /> <company name="Google Inc." url="http://developer.android.com"/> - <build number="__BUILD_NUMBER__" date="__BUILD_DATE__" apiVersion="139.658"/> + <build number="__BUILD_NUMBER__" date="__BUILD_DATE__" apiVersion="139.791"/> <install-over minbuild="0.1" maxbuild="999.999999" version="0"/> <logo url="/artwork/studio_splash.png" textcolor="cccccc" progressColor="90c653" progressY="238" progressTailIcon="/community_progress_tail.png"/> <about url="/artwork/studio_about.png" foreground="cccccc"/> |