resolved conflicts for merge of f44fdaed to master (d02a8985) · Commits · e / os / android_frameworks_base

docs/html/sdk/index.jd

+28 −27

Original line number	Diff line number	Diff line
		@@ -4,45 +4,46 @@ page.template=sdk
		header.hide=1
		page.metaDescription=Download the official Android IDE and developer tools to build apps for Android phones, tablets, wearables, TVs, and more.

		studio.version=1.0.0
		studio.version=1.0.1

		studio.linux_bundle_download=android-studio-ide-135.1629389-linux.zip
		studio.linux_bundle_bytes=243909934
		studio.linux_bundle_checksum=601a302f10cf8a22ba4216e0884a035bdfec38b3
		studio.linux_bundle_download=android-studio-ide-135.1641136-linux.zip
		studio.linux_bundle_bytes=243917559
		studio.linux_bundle_checksum=7c8f2d0cec21b98984cdba45ab5a25f26d67f23a

		studio.mac_bundle_download=android-studio-ide-135.1629389.dmg
		studio.mac_bundle_bytes=245757810
		studio.mac_bundle_checksum=0d9e0e230ece9f2e696b1b076c36ee1e73edcf3c
		studio.mac_bundle_download=android-studio-ide-1641136.dmg
		studio.mac_bundle_bytes=245729073
		studio.mac_bundle_checksum=49506ba2cf6b56be4f7d07e6a00c4ec3ba2249d5

		studio.win_bundle_exe_download=android-studio-bundle-135.1629389.exe
		studio.win_bundle_exe_bytes=868337656
		studio.win_bundle_exe_download=android-studio-bundle-135.1641136.exe
		studio.win_bundle_exe_bytes=868344232
		studio.win_bundle_exe_checksum=1931dbaeadb52f5e0a8ba6e2ae60d9df20b2076b

		studio.win_notools_exe_download=android-studio-ide-135.1629389.exe
		studio.win_notools_exe_bytes=262099808
		studio.win_notools_exe_checksum=bfc6e9397f72969bcb3db80c9abe3a205540c8ab
		studio.win_notools_exe_download=android-studio-ide-135.1641136.exe
		studio.win_notools_exe_bytes=260272840
		studio.win_notools_exe_checksum=464d1c5497ab3d1bdef441365791ab36c89cd5ae

		studio.win_bundle_download=android-studio-ide-135.1629389-windows.zip
		studio.win_bundle_bytes=246241434
		studio.win_bundle_checksum=6951e678a41b94b6172276727537db8590be7270
		studio.win_bundle_download=android-studio-ide-135.1641136-windows.zip
		studio.win_bundle_bytes=246249059
		studio.win_bundle_checksum=6d6856aca83f6ff747ca40b10f70edfbbcccd91c



		sdk.linux_download=android-sdk_r23.0.2-linux.tgz
		sdk.linux_bytes=140827643
		sdk.linux_checksum=94a8c62086a7398cc0e73e1c8e65f71e

		sdk.mac_download=android-sdk_r23.0.2-macosx.zip
		sdk.mac_bytes=90996733
		sdk.mac_checksum=322787b0e6c629d926c28690c79ac0d8
		sdk.linux_download=android-sdk_r24.0.1-linux.tgz
		sdk.linux_bytes=141304203
		sdk.linux_checksum=fb46b9afa04e09d3c33fa9bfee5c99e9ec6a9523

		sdk.win_download=android-sdk_r23.0.2-windows.zip
		sdk.win_bytes=141435413
		sdk.win_checksum=89f0576abf3f362a700767bdc2735c8a
		sdk.mac_download=android-sdk_r24.0.1-macosx.zip
		sdk.mac_bytes=88535741
		sdk.mac_checksum=7097c09c72645d7ad33c81a37b1a1363a9df2a54

		sdk.win_installer=installer_r23.0.2-windows.exe
		sdk.win_installer_bytes=93015376
		sdk.win_installer_checksum=7be4b9c230341e1fb57c0f84a8df3994
		sdk.win_download=android-sdk_r24.0.1-windows.zip
		sdk.win_bytes=140743633
		sdk.win_checksum=cc49974e8bfcc865ffe0d887e9a74cf52085c632

		sdk.win_installer=installer_r24.0.1-windows.exe
		sdk.win_installer_bytes=92180986
		sdk.win_installer_checksum=505d7a95647bccc194b7aa707854422d9c7288d5

docs/html/tools/revisions/studio.jd

+23 −0

Original line number	Diff line number	Diff line
		@@ -39,9 +39,32 @@ manually check for updates, select <strong>Help > Check for updates</strong> (on
		<p>The sections below provide notes about successive releases of
		Android Studio, as denoted by revision number. </p>


		<div class="toggle-content opened">
		<p><a href="#" onclick="return toggleContent(this)">
		<img src="{@docRoot}assets/images/triangle-opened.png" class="toggle-content-img"
		alt=""/>Android Studio v1.0.1</a> <em>(December 2014)</em>
		</p>

		<div class="toggle-content-toggleme">
		<p>Various fixes and enhancements:</p>
		<ul>
		<li>Fixed AVD Manager and <strong>device.xml</strong> file lock issue. </li>
		<li>Fixed the emulator log on Windows systems. </li>
		<li>Fixed issue with creating AVDs with Android Studio and Android SDK installed on different
		drives on Windows systems.</li>
		<li>Sets the default update channel for new downloads to <strong>Stable</strong>. If you
		installed the 1.0.0 version of Android Studio and would like stable, production-ready version
		updates, use <strong>File > Settings > Updates</strong> to change to the <strong>Stable</strong>
		update channel.
		</li>
		</div>
		</div>


		<div class="toggle-content closed">
		<p><a href="#" onclick="return toggleContent(this)">
		<img src="{@docRoot}assets/images/triangle-closed.png" class="toggle-content-img"
		alt=""/>Android Studio v1.0</a> <em>(December 2014)</em>
		</p>