Docs: Changes to source.android.com

  - 186386294 Document sparse build IDs. by Android Partner Docs <noreply@android.com>
  - 186311197 Devsite localized content from translation request 703a84... by Android Partner Docs <noreply@android.com>
  - 186311182 Devsite localized content from translation request 52fd59... by Android Partner Docs <noreply@android.com>
  - 186311170 Devsite localized content from translation request 5ce91a... by Android Partner Docs <noreply@android.com>
  - 186311073 Devsite localized content from translation request 1eb5e4... by Android Partner Docs <noreply@android.com>
  - 186311067 Devsite localized content from translation request a350f8... by Android Partner Docs <noreply@android.com>
  - 186311040 Devsite localized content from translation request 311c15... by Android Partner Docs <noreply@android.com>
  - 186083666 Devsite localized content from translation request c04a20... by Android Partner Docs <noreply@android.com>
  - 186083661 Devsite localized content from translation request 9ed102... by Android Partner Docs <noreply@android.com>
  - 185957552 Devsite localized content from translation request 2e9841... by Android Partner Docs <noreply@android.com>
  - 185846824 Devsite localized content from translation request 1e4314... by Android Partner Docs <noreply@android.com>
  - 185767602 Update CTS/CTS-Verifier downloads for CTS-Feb-2018 Releases by Android Partner Docs <noreply@android.com>
  - 185753300 Update incorrect CVE assignments in February public bulle... by Android Partner Docs <noreply@android.com>
  - 185722157 Devsite localized content from translation request 5f11d4... by Android Partner Docs <noreply@android.com>
  - 185722126 Devsite localized content from translation request cb9a85... by Android Partner Docs <noreply@android.com>
  - 185721715 Devsite localized content from translation request 643c25... by Android Partner Docs <noreply@android.com>
  - 185710613 CDD: Clarify that /sdcard can share storage with /data by Android Partner Docs <noreply@android.com>

PiperOrigin-RevId: 186386294
Change-Id: I0ba14b2f9dfc653c05455516185a9fae43a2f53b

5 files changed, 71 insertions, 63 deletions

diff --git a/en/compatibility/5.1/android-5.1-cdd.html b/en/compatibility/5.1/android-5.1-cdd.html
index 3d0fe896..c2927814 100644
--- a/en/compatibility/5.1/android-5.1-cdd.html
+++ b/en/compatibility/5.1/android-5.1-cdd.html
@@ -3814,8 +3814,9 @@ separately purchased.</li>
 storage as shared storage for apps as included in the upstream Android Open
 Source Project; device implementations SHOULD use this configuration and
 software implementation. If a device implementation uses internal
-(non-removable) storage to satisfy the shared storage requirement, that storage
-MUST be 1GB in size or larger and mounted on /sdcard (or /sdcard MUST be a
+(non-removable) storage to satisfy the shared storage requirement, while that
+storage MAY share space with the application private data, it MUST be at least
+1GB in size and mounted on /sdcard (or /sdcard MUST be a
 symbolic link to the physical location if it is mounted elsewhere).</p>
 
 <p>Device implementations MUST enforce as documented the
diff --git a/en/compatibility/cts/downloads.html b/en/compatibility/cts/downloads.html
index ab07ebd6..32413c37 100644
--- a/en/compatibility/cts/downloads.html
+++ b/en/compatibility/cts/downloads.html
@@ -31,115 +31,115 @@ R&lt;number&gt; in the link name.</p>
 <h2 id="android-81">Android 8.1</h2>
 <p>Android 8.1 is the release of the development milestone code-named Oreo-MR1.
 The source code for the following tests can be synced with the
-'android-cts-8.1_r1' tag in the open-source tree.</p>
+'android-cts-8.1_r2' tag in the open-source tree.</p>
 <ul>
 <li><a
-href="https://dl.google.com/dl/android/cts/android-cts-8.1_r1-linux_x86-arm.zip">Android
-8.1 R1 Compatibility Test Suite (CTS) - ARM</a></li>
+href="https://dl.google.com/dl/android/cts/android-cts-8.1_r2-linux_x86-arm.zip">Android
+8.1 R2 Compatibility Test Suite (CTS) - ARM</a></li>
 <li><a
-href="https://dl.google.com/dl/android/cts/android-cts-8.1_r1-linux_x86-x86.zip">Android
-8.1 R1 Compatibility Test Suite (CTS) - x86</a></li>
+href="https://dl.google.com/dl/android/cts/android-cts-8.1_r2-linux_x86-x86.zip">Android
+8.1 R2 Compatibility Test Suite (CTS) - x86</a></li>
 <li><a
-href="https://dl.google.com/dl/android/cts/android-cts-verifier-8.1_r1-linux_x86-arm.zip">Android
-8.1 R1 CTS Verifier - ARM</a></li>
+href="https://dl.google.com/dl/android/cts/android-cts-verifier-8.1_r2-linux_x86-arm.zip">Android
+8.1 R2 CTS Verifier - ARM</a></li>
 <li><a
-href="https://dl.google.com/dl/android/cts/android-cts-verifier-8.1_r1-linux_x86-x86.zip">Android
-8.1 R1 CTS Verifier - x86</a></li>
+href="https://dl.google.com/dl/android/cts/android-cts-verifier-8.1_r2-linux_x86-x86.zip">Android
+8.1 R2 CTS Verifier - x86</a></li>
 </ul>
 
 <h2 id="android-80">Android 8.0</h2>
 <p>Android 8.0 is the release of the development milestone code-named Oreo.
 The source code for the following tests can be synced with the
-'android-cts-8.0_r5' tag in the open-source tree.</p>
+'android-cts-8.0_r6' tag in the open-source tree.</p>
 <ul>
 <li><a
-href="https://dl.google.com/dl/android/cts/android-cts-8.0_r5-linux_x86-arm.zip">Android
-8.0 R5 Compatibility Test Suite (CTS) - ARM</a></li>
+href="https://dl.google.com/dl/android/cts/android-cts-8.0_r6-linux_x86-arm.zip">Android
+8.0 R6 Compatibility Test Suite (CTS) - ARM</a></li>
 <li><a
-href="https://dl.google.com/dl/android/cts/android-cts-8.0_r5-linux_x86-x86.zip">Android
-8.0 R5 Compatibility Test Suite (CTS) - x86</a></li>
+href="https://dl.google.com/dl/android/cts/android-cts-8.0_r6-linux_x86-x86.zip">Android
+8.0 R6 Compatibility Test Suite (CTS) - x86</a></li>
 <li><a
-href="https://dl.google.com/dl/android/cts/android-cts-verifier-8.0_r5-linux_x86-arm.zip">Android
-8.0 R5 CTS Verifier - ARM</a></li>
+href="https://dl.google.com/dl/android/cts/android-cts-verifier-8.0_r6-linux_x86-arm.zip">Android
+8.0 R6 CTS Verifier - ARM</a></li>
 <li><a
-href="https://dl.google.com/dl/android/cts/android-cts-verifier-8.0_r5-linux_x86-x86.zip">Android
-8.0 R5 CTS Verifier - x86</a></li>
+href="https://dl.google.com/dl/android/cts/android-cts-verifier-8.0_r6-linux_x86-x86.zip">Android
+8.0 R6 CTS Verifier - x86</a></li>
 </ul>
 
 <h2 id="android-71">Android 7.1</h2>
 <p>Android 7.1 is the release of the development milestone code-named Nougat-MR1.
 The source code for the following tests can be synced with the
-'android-cts-7.1_r13' tag in the open-source tree.</p>
+'android-cts-7.1_r14' tag in the open-source tree.</p>
 <ul>
 <li><a
-href="https://dl.google.com/dl/android/cts/android-cts-7.1_r13-linux_x86-arm.zip">Android
-7.1 R13 Compatibility Test Suite (CTS) - ARM</a></li>
+href="https://dl.google.com/dl/android/cts/android-cts-7.1_r14-linux_x86-arm.zip">Android
+7.1 R14 Compatibility Test Suite (CTS) - ARM</a></li>
 <li><a
-href="https://dl.google.com/dl/android/cts/android-cts-7.1_r13-linux_x86-x86.zip">Android
-7.1 R13 Compatibility Test Suite (CTS) - x86</a></li>
+href="https://dl.google.com/dl/android/cts/android-cts-7.1_r14-linux_x86-x86.zip">Android
+7.1 R14 Compatibility Test Suite (CTS) - x86</a></li>
 <li><a
-href="https://dl.google.com/dl/android/cts/android-cts-verifier-7.1_r13-linux_x86-arm.zip">Android
-7.1 R13 CTS Verifier - ARM</a></li>
+href="https://dl.google.com/dl/android/cts/android-cts-verifier-7.1_r14-linux_x86-arm.zip">Android
+7.1 R14 CTS Verifier - ARM</a></li>
 <li><a
-href="https://dl.google.com/dl/android/cts/android-cts-verifier-7.1_r13-linux_x86-x86.zip">Android
-7.1 R13 CTS Verifier - x86</a></li>
+href="https://dl.google.com/dl/android/cts/android-cts-verifier-7.1_r14-linux_x86-x86.zip">Android
+7.1 R14 CTS Verifier - x86</a></li>
 </ul>
 
 <h2 id="android-70">Android 7.0</h2>
 <p>Android 7.0 is the release of the development milestone code-named Nougat.
 The source code for the following tests can be synced with the
-'android-cts-7.0_r17' tag in the open-source tree.</p>
+'android-cts-7.0_r18' tag in the open-source tree.</p>
 <ul>
 <li><a
-href="https://dl.google.com/dl/android/cts/android-cts-7.0_r17-linux_x86-arm.zip">Android
-7.0 R17 Compatibility Test Suite (CTS) - ARM</a></li>
+href="https://dl.google.com/dl/android/cts/android-cts-7.0_r18-linux_x86-arm.zip">Android
+7.0 R18 Compatibility Test Suite (CTS) - ARM</a></li>
 <li><a
-href="https://dl.google.com/dl/android/cts/android-cts-7.0_r17-linux_x86-x86.zip">Android
-7.0 R17 Compatibility Test Suite (CTS) - x86</a></li>
+href="https://dl.google.com/dl/android/cts/android-cts-7.0_r18-linux_x86-x86.zip">Android
+7.0 R18 Compatibility Test Suite (CTS) - x86</a></li>
 <li><a
-href="https://dl.google.com/dl/android/cts/android-cts-verifier-7.0_r17-linux_x86-arm.zip">Android
-7.0 R17 CTS Verifier - ARM</a></li>
+href="https://dl.google.com/dl/android/cts/android-cts-verifier-7.0_r18-linux_x86-arm.zip">Android
+7.0 R18 CTS Verifier - ARM</a></li>
 <li><a
-href="https://dl.google.com/dl/android/cts/android-cts-verifier-7.0_r17-linux_x86-x86.zip">Android
-7.0 R17 CTS Verifier - x86</a></li>
+href="https://dl.google.com/dl/android/cts/android-cts-verifier-7.0_r18-linux_x86-x86.zip">Android
+7.0 R18 CTS Verifier - x86</a></li>
 </ul>
 
 <h2 id="android-60">Android 6.0</h2>
 <p>Android 6.0 is the release of the development milestone code-named Marshmallow.
 The source code for the following tests can be synced with the
-'android-cts-6.0_r25' tag in the open-source tree.</p>
+'android-cts-6.0_r26' tag in the open-source tree.</p>
 <ul>
 <li><a
-href="https://dl.google.com/dl/android/cts/android-cts-6.0_r25-linux_x86-arm.zip">Android
-6.0 R25 Compatibility Test Suite (CTS) - ARM</a></li>
+href="https://dl.google.com/dl/android/cts/android-cts-6.0_r26-linux_x86-arm.zip">Android
+6.0 R26 Compatibility Test Suite (CTS) - ARM</a></li>
 <li><a
-href="https://dl.google.com/dl/android/cts/android-cts-6.0_r25-linux_x86-x86.zip">Android
-6.0 R25 Compatibility Test Suite (CTS) - x86</a></li>
+href="https://dl.google.com/dl/android/cts/android-cts-6.0_r26-linux_x86-x86.zip">Android
+6.0 R26 Compatibility Test Suite (CTS) - x86</a></li>
 <li><a
-href="https://dl.google.com/dl/android/cts/android-cts-verifier-6.0_r25-linux_x86-arm.zip">Android
-6.0 R25 CTS Verifier - ARM</a></li>
+href="https://dl.google.com/dl/android/cts/android-cts-verifier-6.0_r26-linux_x86-arm.zip">Android
+6.0 R26 CTS Verifier - ARM</a></li>
 <li><a
-href="https://dl.google.com/dl/android/cts/android-cts-verifier-6.0_r25-linux_x86-x86.zip">Android
-6.0 R25 CTS Verifier - x86</a></li>
+href="https://dl.google.com/dl/android/cts/android-cts-verifier-6.0_r26-linux_x86-x86.zip">Android
+6.0 R26 CTS Verifier - x86</a></li>
 </ul>
 
 <h2 id="android-51">Android 5.1</h2>
 <p>Android 5.1 is the release of the development milestone code-named Lollipop-MR1.
 The source code for the following tests can be synced with the
-'android-cts-5.1_r26' tag in the open source tree.</p>
+'android-cts-5.1_r27' tag in the open source tree.</p>
 <ul>
 <li><a
-href="https://dl.google.com/dl/android/cts/android-cts-5.1_r26-linux_x86-arm.zip">Android
-5.1 R26 Compatibility Test Suite (CTS) - ARM</a></li>
+href="https://dl.google.com/dl/android/cts/android-cts-5.1_r27-linux_x86-arm.zip">Android
+5.1 R27 Compatibility Test Suite (CTS) - ARM</a></li>
 <li><a
-href="https://dl.google.com/dl/android/cts/android-cts-5.1_r26-linux_x86-x86.zip">Android
-5.1 R26 Compatibility Test Suite (CTS) - x86</a></li>
+href="https://dl.google.com/dl/android/cts/android-cts-5.1_r27-linux_x86-x86.zip">Android
+5.1 R27 Compatibility Test Suite (CTS) - x86</a></li>
 <li><a
-href="https://dl.google.com/dl/android/cts/android-cts-verifier-5.1_r26-linux_x86-arm.zip">Android
-5.1 R26 CTS Verifier - ARM</a></li>
+href="https://dl.google.com/dl/android/cts/android-cts-verifier-5.1_r27-linux_x86-arm.zip">Android
+5.1 R27 CTS Verifier - ARM</a></li>
 <li><a
-href="https://dl.google.com/dl/android/cts/android-cts-verifier-5.1_r26-linux_x86-x86.zip">Android
-5.1 R26 CTS Verifier - x86</a></li>
+href="https://dl.google.com/dl/android/cts/android-cts-verifier-5.1_r27-linux_x86-x86.zip">Android
+5.1 R27 CTS Verifier - x86</a></li>
 </ul>
 
 <h2 id="android-50">Android 5.0</h2>
diff --git a/en/security/bulletin/2018-02-01.html b/en/security/bulletin/2018-02-01.html
index 67509dfb..878f2beb 100644
--- a/en/security/bulletin/2018-02-01.html
+++ b/en/security/bulletin/2018-02-01.html
@@ -20,7 +20,7 @@
       See the License for the specific language governing permissions and
       limitations under the License.
   -->
-  <p><em>Published February 5, 2018 | February 7, 2018</em></p>
+  <p><em>Published February 5, 2018 | February 14, 2018</em></p>
 
 
 <p>
@@ -287,7 +287,7 @@ Upstream kernel</a></td>
     <td>Multi-queue block IO</td>
   </tr>
   <tr>
-    <td>CVE-2017-17770</td>
+    <td>CVE-2017-13273</td>
     <td>A-65853158<a href="#asterisk">*</a></td>
     <td>EoP</td>
     <td>High</td>
@@ -362,7 +362,7 @@ QC-CR#2076603</a>
     <td>WLan</td>
   </tr>
   <tr>
-    <td>CVE-2017-17760</td>
+    <td>CVE-2017-15860</td>
     <td>A-68992416<br />
         <a href="https://source.codeaurora.org/quic/la/platform/vendor/qcom-opensource/wlan/qcacld-2.0/commit/?id=71331327ac389bff7d5af2707c4325e5b7949013">
 QC-CR#2082544</a>
@@ -397,7 +397,7 @@ QC-CR#2115112</a></td>
     <td>WLan</td>
   </tr>
   <tr>
-    <td>CVE-2017-17762</td>
+    <td>CVE-2017-15862</td>
     <td>A-68992439<br />
         <a href="https://source.codeaurora.org/quic/la/platform/vendor/qcom-opensource/wlan/qcacld-3.0/commit/?id=41ee23cd0972ef2ed47dd76eb7cd44a0268e4f9f">
 QC-CR#2114426</a></td>
@@ -442,7 +442,7 @@ QC-CR#2114789</a></td>
     <td>WLan</td>
   </tr>
   <tr>
-    <td>CVE-2017-17761</td>
+    <td>CVE-2017-15861</td>
     <td>A-68992434<br />
         <a href="https://source.codeaurora.org/quic/la/platform/vendor/qcom-opensource/wlan/qcacld-3.0/commit/?id=13e3a516935a0dd90a7bc39e51c30c1592c548b7">
 QC-CR#2114187</a></td>
@@ -644,5 +644,11 @@ security bulletins.
    <td>February 7, 2018</td>
    <td>Bulletin revise to include AOSP links.</td>
   </tr>
+  <tr>
+   <td>1.2</td>
+   <td>February 14, 2018</td>
+   <td>Corrected CVE numbers for CVE-2017-13273, CVE-2017-15860, CVE-2017-15861 and
+     CVE-2017-15862.</td>
+  </tr>
 </table>
 	</body></html>
diff --git a/en/security/overview/acknowledgements.html b/en/security/overview/acknowledgements.html
index 0f5f91d0..f9f73b0e 100644
--- a/en/security/overview/acknowledgements.html
+++ b/en/security/overview/acknowledgements.html
@@ -149,7 +149,7 @@ Team
    <td>Yonggang Guo (<a href="https://twitter.com/guoygang">@guoygang</a>) of
 IceSword Lab, Qihoo 360 Technology Co. Ltd.
    </td>
-   <td>CVE-2017-17770
+   <td>CVE-2017-13273
    </td>
   </tr>
   <tr>
diff --git a/en/setup/build-numbers.html b/en/setup/build-numbers.html
index f0ba4a2e..10f50cd5 100644
--- a/en/setup/build-numbers.html
+++ b/en/setup/build-numbers.html
@@ -171,12 +171,13 @@ API levels and NDK releases provided for convenience:</p>
 </tr>
 </tbody>
 </table>
-<p>Starting with Oreo, individual builds are identified with a new build ID format, in the form of PVBB.YYMMDD.bbb.</p>
+<p>Starting with Oreo, individual builds are identified with a new build ID format, in the form of PVBB.YYMMDD.bbb[.Cn].</p>
 <p>The P part represents the first letter of the code name of the platform release, e.g. O is Oreo.</p>
 <p>The V part represents a supported vertical. By convention, 'P' represents the primary platform branch.</p>
 <p>The BB part represents a alpha numeric code which allows Google to identify the exact code branch that the build was made from.</p>
 <p>The YYMMDD part identifies the date when the release is branched from or synced with the development branch.  It is not guaranteed to be  the exact date at which a build was made, and it is common that minor variations added to an existing build re-use the same date code as that existing build.</p>
 <p>The bbb part identifies individual versions related to the same date code, sequentially starting with 001.</p>
+<p>An optional, alphanumeric Cn part identifies a hotfix on top of an existing PVBB.YYMMDD.bbb build, starting from A1.</p>
 <p>Older Android releases from Cupcake to Nougat uses a different build ID scheme.  These Android builds are identified with a short build code, e.g. FRF85B.
 </p>
 <p>The first letter is the code name of the release family, e.g. F is