diff options
| author | Tor Norbye <tnorbye@google.com> | 2015-02-18 11:32:39 -0800 |
|---|---|---|
| committer | Tor Norbye <tnorbye@google.com> | 2015-02-18 11:32:39 -0800 |
| commit | 0a0a161ae731023309071fac4f523eab67ed3786 (patch) | |
| tree | 27cc84ddd42940a52847a001ec7489c453e77251 /adt-branding | |
| parent | 73637fab6b8b0bfb40f145f7245a9d33fa1a4620 (diff) | |
| parent | 0db46401d96c8e9a203e778790d70f699ca82259 (diff) | |
| download | idea-0a0a161ae731023309071fac4f523eab67ed3786.tar.gz | |
Merge remote-tracking branch 'aosp/upstream-133' into merge-upstream
Conflicts:
android/src/com/android/tools/idea/gradle/project/GradleProjectImporter.java
Change-Id: I45c82b8cd5ec0fee59a47a70652cec2e8b003de9
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 12aee816946..e22072d8658 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.2285"/> + <build number="__BUILD_NUMBER__" date="__BUILD_DATE__" apiVersion="140.2493"/> <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"/> |