diff options
| author | Tor Norbye <tnorbye@google.com> | 2015-02-11 07:08:39 -0800 |
|---|---|---|
| committer | Tor Norbye <tnorbye@google.com> | 2015-02-11 07:08:39 -0800 |
| commit | 24473fdc71a53b767499a1678ea79994db307c18 (patch) | |
| tree | f38e963e6765a6d4eee9c7da67997b3389bf7583 /adt-branding | |
| parent | 10e0a8f9ebc31b72ec623359d68b4437106dab0d (diff) | |
| parent | 1b05f5c1f37185bd5969a2b1289081631d3186d8 (diff) | |
| download | idea-24473fdc71a53b767499a1678ea79994db307c18.tar.gz | |
Merge remote-tracking branch 'aosp/upstream-133' into merge-upstream
Conflicts:
android/src/META-INF/plugin.xml
android/src/com/android/tools/idea/gradle/messages/ProjectSyncMessages.java
android/src/com/android/tools/idea/gradle/project/PostProjectSetupTasksExecutor.java
Change-Id: I1d22c4b83105f2881dae4949287ded633ad64dd8
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 8daa86ca05c..12aee816946 100755 --- a/adt-branding/src/idea/AndroidStudioApplicationInfo.xml +++ b/adt-branding/src/idea/AndroidStudioApplicationInfo.xml @@ -16,7 +16,7 @@ <component> <version major="1" minor="2" strict="1.2.0a1" eap="true" /> <company name="Google" url="http://developer.android.com"/> - <build number="__BUILD_NUMBER__" date="__BUILD_DATE__" apiVersion="140.2110"/> + <build number="__BUILD_NUMBER__" date="__BUILD_DATE__" apiVersion="140.2285"/> <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"/> |