Merge "docs: Updates to Android 5.0 API Overview." into lmp-dev (67b5c8eb) · Commits · e / os / android_frameworks_base

docs/html/about/versions/android-5.0.jd

+5 −6

Original line number	Diff line number	Diff line
		@@ -109,7 +109,9 @@ sdk.platform.apiLevel=21
		<h2>See also</h2>
		<ol>
		<li><a href="{@docRoot}sdk/api_diff/21/changes.html">API
		Differences Report »</a> </li>
		Differences Report (API level 20 to 21) »</a> </li>
		<li><a href="{@docRoot}sdk/api_diff/preview-21/changes.html">API
		Differences Report (L Developer Preview to 21) »</a> </li>
		</ol>

		</div>
		@@ -117,7 +119,7 @@ Differences Report »</a> </li>

		<p>API Level: {@sdkPlatformApiLevel}</p>

		<p>Android 5.0 (<a href="{@docRoot}reference/android/os/Build.VERSION_CODES.html#L">Lollipop</a>)
		<p>Android 5.0 (<a href="{@docRoot}reference/android/os/Build.VERSION_CODES.html#LOLLIPOP">LOLLIPOP</a>)
		offers new features for users and app developers. This document provides an
		introduction to the most notable new APIs.</p>

		@@ -1184,6 +1186,3 @@ element to declare the permissions your app requires to access certain APIs.</p>
		<li>{@link android.Manifest.permission#WRITE_VOICEMAIL}: Required to allow your
		app to modify and remove existing voicemails in the system.</li>
		</ul>
		No newline at end of file

		<p class="note">For a detailed view of all API changes in Android 5.0, see the
		<a href="{@docRoot}sdk/api_diff/21/changes.html">API Differences Report</a>.</p>