Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 38b71c57 authored by smain@google.com's avatar smain@google.com Committed by android-build-merger
Browse files

Merge \"update the version number used in docs and update the offline docs... 

Merge \"update the version number used in docs and update the offline docs landing page\" into nyc-dev
am: 6623f417

Change-Id: Iedcaed7bc842c353bbf2dc3f66dfa5054613d1e8
parents edf16d6d 6623f417

Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -895,7 +895,7 @@ framework_docs_SDK_REL_ID:=1 


framework_docs_LOCAL_DROIDDOC_OPTIONS += \

		-hdf sdk.codename N \

		-hdf sdk.preview.version 2 \

		-hdf sdk.preview.version 5 \

		-hdf sdk.version $(framework_docs_SDK_VERSION) \

		-hdf sdk.rel.id $(framework_docs_SDK_REL_ID) \

		-hdf sdk.preview 1

docs/docs-preview-index.html

+4 −7
Original line number Diff line number Diff line
@@ -79,19 +79,16 @@ href="http://fonts.googleapis.com/css?family=Roboto+Condensed"> 


<h2>Get Started</h2>

<ul>

  <li>View the <a href="reference/packages.html">API Reference</a></li>

  <li>View the <a href="reference/packages.html">offline API Reference</a></li>

  <li>Read Diff Reports:</a>

    <ul>

      <li><a href="sdk/api_diff/n-preview-1/changes.html"

        >API 23 --> Preview 1</a></li>

      <li><a href="https://developer.android.com/sdk/api_diff/24/changes.html"

        >API 23 --> API 24</a></li>

    </ul>

  </li>

  <li>Downloads and additional documentation are available at the

  <li>For more information, visit the

    <a href="http://developer.android.com/preview/index.html">

      Android N Developer Preview site</a></li>

  <li>For information about Developer Preview 1, visit the

    <a href="http://developer.android.com/preview/support.html">Support</a>

    page.</li>

</ul>