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

Commit 719dc196 authored by Dirk Dougherty's avatar Dirk Dougherty Committed by android-build-merger
Browse files

Merge "Merge "Correct the DP2 status beta -> alpha." into mnc-mr-docs am:... 

Merge "Merge "Correct the DP2 status beta -> alpha." into mnc-mr-docs am: 3a263cec am: 6d3ca9aa am: 0e4b51eb am: b72bf5cf am: e863a112" into nyc-mr1-dev-plus-aosp
am: 9805cf24

* commit '9805cf24':
  Correct the DP2 status beta -> alpha.

Change-Id: If186013773a3200dc5a3fffb0a0edcc2e9b0a39e
parents 3a19d76b 9805cf24

docs/html-intl/intl/es/preview/overview.jd

+2 −2
Original line number Original line Diff line number Diff line
@@ -151,8 +151,8 @@ page.tags="preview", "developer", "android" 
</p>

</p>





<ul>

<ul>

  <li><strong><a href="{@docRoot}preview/support.html">Preview 1</a></strong> (versión inicial, alpha);</li>

  <li><strong><a href="{@docRoot}preview/support.html#dp1">Preview 1</a></strong> (versión inicial, alpha);</li>

  <li><strong>Preview 2</strong> (actualización gradual, beta);</li>

  <li><strong><a href="{@docRoot}preview/support.html#dp2">Preview 2</a></strong> (actualización gradual, alpha);</li>

  <li><strong>Preview 3</strong> (actualización gradual, beta);</li>

  <li><strong>Preview 3</strong> (actualización gradual, beta);</li>

  <li><strong>Preview 4</strong> (API finales y SDK oficial, publicación en Google Play);</li>

  <li><strong>Preview 4</strong> (API finales y SDK oficial, publicación en Google Play);</li>

  <li><strong>Preview 5</strong> (imágenes de sistema casi definitivas para pruebas finales);</li>

  <li><strong>Preview 5</strong> (imágenes de sistema casi definitivas para pruebas finales);</li>

docs/html-intl/intl/in/preview/overview.jd

+2 −2
Original line number Original line Diff line number Diff line
@@ -151,8 +151,8 @@ page.tags="preview", "developer", "android" 
</p>

</p>





<ul>

<ul>

  <li><strong><a href="{@docRoot}preview/support.html">Preview 1</a></strong> (rilis pertama, alfa)</li>

  <li><strong><a href="{@docRoot}preview/support.html#dp1">Preview 1</a></strong> (rilis pertama, alfa)</li>

  <li><strong>Preview 2</strong> (pembaruan bertahap, beta)</li>

  <li><strong><a href="{@docRoot}preview/support.html#dp2">Preview 2</a></strong> (pembaruan bertahap, alpha)</li>

  <li><strong>Preview 3</strong> (pembaruan bertahap, beta)</li>

  <li><strong>Preview 3</strong> (pembaruan bertahap, beta)</li>

  <li><strong>Preview 4</strong> (API final dan SDK resmi, publikasi di Play)</li>

  <li><strong>Preview 4</strong> (API final dan SDK resmi, publikasi di Play)</li>

  <li><strong>Preview 5</strong> (citra sistem hampir final untuk pengujian akhir)</li>

  <li><strong>Preview 5</strong> (citra sistem hampir final untuk pengujian akhir)</li>

docs/html-intl/intl/ja/preview/overview.jd

+2 −2
Original line number Original line Diff line number Diff line
@@ -151,8 +151,8 @@ page.tags="preview", "developer", "android" 
</p>

</p>





<ul>

<ul>

  <li><strong><a href="{@docRoot}preview/support.html">Preview 1</a></strong>（初回リリース、アルファ版）</li>

  <li><strong><a href="{@docRoot}preview/support.html#dp1">Preview 1</a></strong>（初回リリース、アルファ版）</li>

  <li><strong>Preview 2</strong>（追加アップデート、ベータ版）</li>

  <li><strong><a href="{@docRoot}preview/support.html#dp2">Preview 2</a></strong>（追加アップデート、アルファ版）</li>

  <li><strong>Preview 3</strong>（追加アップデート、ベータ版）</li>

  <li><strong>Preview 3</strong>（追加アップデート、ベータ版）</li>

  <li><strong>Preview 4</strong>（最終版の API と正式な SDK、Google Play への公開）</li>

  <li><strong>Preview 4</strong>（最終版の API と正式な SDK、Google Play への公開）</li>

  <li><strong>Preview 5</strong>（最終テスト用の最終版とほぼ同じシステム イメージ）</li>

  <li><strong>Preview 5</strong>（最終テスト用の最終版とほぼ同じシステム イメージ）</li>

docs/html-intl/intl/ko/preview/overview.jd

+2 −2
Original line number Original line Diff line number Diff line
@@ -151,8 +151,8 @@ AOSP 및 OEM에 Android N 최종 공개 릴리스까지 진행됩니다. 
</p>

</p>





<ul>

<ul>

  <li><strong><a href="{@docRoot}preview/support.html">Preview 1</a></strong>(최초 릴리스, 알파)</li>

  <li><strong><a href="{@docRoot}preview/support.html#dp1">Preview 1</a></strong>(최초 릴리스, 알파)</li>

  <li><strong>Preview 2</strong>(증분 업데이트, 베타)</li>

  <li><strong><a href="{@docRoot}preview/support.html#dp2">Preview 2</a></strong>(증분 업데이트, 알파)</li>

  <li><strong>Preview 3</strong>(증분 업데이트, 베타)</li>

  <li><strong>Preview 3</strong>(증분 업데이트, 베타)</li>

  <li><strong>Preview 4</strong>(최종 API 및 공식 SDK, Play 게시)</li>

  <li><strong>Preview 4</strong>(최종 API 및 공식 SDK, Play 게시)</li>

  <li><strong>Preview 5</strong>(최종 테스트를 위한 거의 최종 시스템 이미지)</li>

  <li><strong>Preview 5</strong>(최종 테스트를 위한 거의 최종 시스템 이미지)</li>

docs/html-intl/intl/pt-br/preview/overview.jd

+2 −2
Original line number Original line Diff line number Diff line
@@ -151,8 +151,8 @@ page.tags="preview", "developer", "android" 
</p>

</p>





<ul>

<ul>

  <li><strong><a href="{@docRoot}preview/support.html">Preview 1</a></strong> (versão inicial, alpha)</li>

  <li><strong><a href="{@docRoot}preview/support.html#dp1">Preview 1</a></strong> (versão inicial, alpha)</li>

  <li><strong>Preview 2</strong> (atualização incremental, beta)</li>

  <li><strong><a href="{@docRoot}preview/support.html#dp2">Preview 2</a></strong> (atualização incremental, alpha)</li>

  <li><strong>Preview 3</strong> (atualização incremental, beta)</li>

  <li><strong>Preview 3</strong> (atualização incremental, beta)</li>

  <li><strong>Preview 4</strong> (APIs finais e SDK oficial, publicação no Play)</li>

  <li><strong>Preview 4</strong> (APIs finais e SDK oficial, publicação no Play)</li>

  <li><strong>Preview 5</strong> (imagens de sistema quase finalizadas para o teste final)</li>

  <li><strong>Preview 5</strong> (imagens de sistema quase finalizadas para o teste final)</li>