Docs: Changes to source.android.com

  - 198492022 Devsite localized content from translation request 921959. by Android Partner Docs <noreply@android.com>
  - 198492014 Devsite localized content from translation request 886705. by Android Partner Docs <noreply@android.com>
  - 198492011 Devsite localized content from translation request 916424. by Android Partner Docs <noreply@android.com>
  - 198491984 Devsite localized content from translation request 903925. by Android Partner Docs <noreply@android.com>
  - 198491899 Devsite localized content from translation request 930808. by Android Partner Docs <noreply@android.com>
  - 198491892 Devsite localized content from translation request 924088. by Android Partner Docs <noreply@android.com>
  - 198491883 Devsite localized content from translation request 911805. by Android Partner Docs <noreply@android.com>
  - 198491880 Devsite localized content from translation request 61faa0... by Android Partner Docs <noreply@android.com>
  - 198491862 Devsite localized content from translation request 926778. by Android Partner Docs <noreply@android.com>
  - 198491722 Devsite localized content from translation request 924089. by Android Partner Docs <noreply@android.com>
  - 198491718 Devsite localized content from translation request 8df61c... by Android Partner Docs <noreply@android.com>
  - 198491711 Devsite localized content from translation request 930091. by Android Partner Docs <noreply@android.com>
  - 198484533 Removing Lollipop reference from the Auto-merge flow sect... by Android Partner Docs <noreply@android.com>
  - 198476465 Remove lollipop-mr1-cts-dev from Release schedule and bra... by Android Partner Docs <noreply@android.com>
  - 198476128 Add section "Booting: Device Tree Overlays" by Android Partner Docs <noreply@android.com>
  - 197976063 Update supported locations of idc/kl/kcm files by Android Partner Docs <noreply@android.com>
  - 197967855 Resurrect N8I11F (October 2017) release for shamu. by Android Partner Docs <noreply@android.com>
  - 197784263 Add news post for camera updates on homepage by Kenneth Lau <kennethlau@google.com>
  - 197755508 Fix link text to match correct line by Kenneth Lau <kennethlau@google.com>
  - 197735556 Create lower tabs for androidsource reference docs. Chang... by Android Partner Docs <noreply@android.com>
  - 197656296 Add Bootloader to home by Clay Murphy <claym@google.com>

PiperOrigin-RevId: 198492022
Change-Id: Ice33f6ed6d40ee49f3de46083db717b934ea5d12

10 files changed, 77 insertions, 41 deletions

diff --git a/en/_book.yaml b/en/_book.yaml
index 065b9fa4..1f582328 100644
--- a/en/_book.yaml
+++ b/en/_book.yaml
@@ -32,6 +32,16 @@ upper_tabs:
 - name: Reference
   lower_tabs:
     other:
-    - name: Reference
+    - name: Overview
       contents:
-      - include: /reference/_toc.yaml
+      - title: Overview
+        path: /reference/
+    - name: HIDL
+      contents:
+      - include: /reference/hidl/_toc.yaml
+    - name: HAL
+      contents:
+      - include: /reference/hal/_toc.yaml
+    - name: Trade Federation
+      contents:
+      - include: /reference/tradefed/_toc.yaml
diff --git a/en/_index.yaml b/en/_index.yaml
index 8a243a8b..a5259f94 100644
--- a/en/_index.yaml
+++ b/en/_index.yaml
@@ -69,6 +69,20 @@ landing_page:
       image_path: /images/android_stack.png
   - heading: News
     items:
+    - heading: Camera HAL
+      description: >
+        The camera Hardware Abstraction Layer (HAL) documentation has been
+        updated to include references to the camera HIDL interface.
+      buttons:
+      - label: May 23rd, 2018
+        path: /devices/camera/
+    - heading: Bootloader Instructions
+      description: >
+        Android has supplied guidance for implementing a bootloader that
+        matches the bring-up image used by the Android build team.
+      buttons:
+      - label: May 15th, 2018
+        path: /devices/bootloader/
     - heading: May Security Bulletins
       description: >
         The May 2018 Android and Pixel/Nexus Security Bulletins have been
@@ -77,22 +91,6 @@ landing_page:
       buttons:
       - label: May 9th, 2018
         path: /security/bulletin/2018-05-01
-    - heading: Modular Kernel Requirements
-      description: >
-        Modular kernel requirements have been relaxed to remove the restriction
-        on mounting only certain partitions in the first stage of
-        <code>init</code>.
-      buttons:
-      - label: May 2nd, 2018
-        path: /devices/architecture/kernel/modular-kernels
-    - heading: HiKey960 Vendor Partition
-      description: >
-        HiKey960 documentation now includes the vendor partition.  And CTS
-        Setup now notes the property <code>ro.product.first_api_level</code>
-        should be unset (removed) and not set to 0.
-      buttons:
-      - label: April 11th, 2018
-        path: /setup/build/devices
   - classname: devsite-landing-row-100 tf-row-centered
     items:
     - buttons:
diff --git a/en/compatibility/cts/development.html b/en/compatibility/cts/development.html
index 2044b750..cc668123 100644
--- a/en/compatibility/cts/development.html
+++ b/en/compatibility/cts/development.html
@@ -278,12 +278,7 @@ updated from time to time as CTS for the given Android version matures.</p>
   <td>Monthly</td>
 </tr>
 <tr>
-  <td>5.1</td>
-  <td>lollipop-mr1-cts-dev</td>
-  <td>Monthly</td>
-</tr>
-<tr>
-  <td colspan="3">No releases are planned for 5.0, 4.4, 4.3 and 4.2.</td>
+  <td colspan="3">No releases are planned for 5.1, 5.0, 4.4, 4.3 and 4.2.</td>
 </tr>
 </table>
 
@@ -303,7 +298,7 @@ Open Source Project (AOSP).
 
 <p>CTS development branches have been set up so that changes submitted to each
 branch will automatically merge as below:<br>
-lollipop-mr1-cts-dev -> marshmallow-cts-dev ->
+marshmallow-cts-dev ->
 nougat-cts-dev -> nougat-mr1-cts-dev -> oreo-cts-dev -> oreo-mr1-cts-dev -> &lt;private-development-branch for Android P&gt;</p>
 
 <p>If a changelist (CL) fails to merge correctly, the author of the CL will get
diff --git a/en/devices/bootloader/flashing-updating.html b/en/devices/bootloader/flashing-updating.html
index 5fdc5aa9..9c05593c 100644
--- a/en/devices/bootloader/flashing-updating.html
+++ b/en/devices/bootloader/flashing-updating.html
@@ -64,6 +64,18 @@ messaging, to land as:
 <code>androidboot.bootreason=&lt;reason&gt;</code></li>
 
 </ul>
+<h2 id="booting-device-tree">Booting: device tree/device tree overlays</h2>
+<p>
+To support various configurations, the bootloader can identify the hardware/product revision
+it is running on and load the correct set of device tree overlays.
+</p>
+<h3 id="kaslr-seed-from-bootloader">Supporting Kernel Address Space Layout Randomization</h3>
+<p>
+In order to support randomizing the virtual address at which the kernel image is loaded
+(enabled by kernel config RANDOMIZE_BASE), the bootloader needs to provide entropy
+by passing a random u64 value in the DT node /chosen/kaslr-seed.
+</p>
+
 <h2 id="implementing-verified-boot">Implementing verified boot</h2>
 <p>
 Refer to <a
diff --git a/en/devices/camera/versioning.html b/en/devices/camera/versioning.html
index 03247001..b6e3404f 100644
--- a/en/devices/camera/versioning.html
+++ b/en/devices/camera/versioning.html
@@ -338,7 +338,7 @@ The method name is <code><a
     href="https://developer.android.com/reference/android/hardware/camera2/CameraCaptureSession.StateCallback.html#onCaptureQueueEmpty(android.hardware.camera2.CameraCaptureSession)">android.hardware.camera2.CameraDevice#createCustomCaptureSession</a></code>.
 See:
 <a href="https://android.googlesource.com/platform/frameworks/base/+/master/core/java/android/hardware/camera2/CameraDevice.java#805">
-  <code>frameworks/base/core/java/android/hardware/camera2/CameraDevice.java#797</code></a></p>
+  <code>frameworks/base/core/java/android/hardware/camera2/CameraDevice.java#805</code></a></p>
 
 <aside class="note"><strong>Note:</strong> In the Android 8.1 release,
   applications must be preinstalled on the system image to access this API.
diff --git a/en/devices/input/input-device-configuration-files.html b/en/devices/input/input-device-configuration-files.html
index 20402dac..97234ab0 100644
--- a/en/devices/input/input-device-configuration-files.html
+++ b/en/devices/input/input-device-configuration-files.html
@@ -53,11 +53,17 @@ especially built-in touch screens, usually need IDC files.</p>
 optionally version) id or by input device name.</p>
 <p>The following paths are consulted in order.</p>
 <ul>
+<li><code>/odm/usr/idc/Vendor_XXXX_Product_XXXX_Version_XXXX.idc</code></li>
+<li><code>/vendor/usr/idc/Vendor_XXXX_Product_XXXX_Version_XXXX.idc</code></li>
 <li><code>/system/usr/idc/Vendor_XXXX_Product_XXXX_Version_XXXX.idc</code></li>
-<li><code>/system/usr/idc/Vendor_XXXX_Product_XXXX.idc</code></li>
-<li><code>/system/usr/idc/DEVICE_NAME.idc</code></li>
 <li><code>/data/system/devices/idc/Vendor_XXXX_Product_XXXX_Version_XXXX.idc</code></li>
+<li><code>/odm/usr/idc/Vendor_XXXX_Product_XXXX.idc</code></li>
+<li><code>/vendor/usr/idc/Vendor_XXXX_Product_XXXX.idc</code></li>
+<li><code>/system/usr/idc/Vendor_XXXX_Product_XXXX.idc</code></li>
 <li><code>/data/system/devices/idc/Vendor_XXXX_Product_XXXX.idc</code></li>
+<li><code>/odm/usr/idc/DEVICE_NAME.idc</code></li>
+<li><code>/vendor/usr/idc/DEVICE_NAME.idc</code></li>
+<li><code>/system/usr/idc/DEVICE_NAME.idc</code></li>
 <li><code>/data/system/devices/idc/DEVICE_NAME.idc</code></li>
 </ul>
 <p>When constructing a file path that contains the device name, all characters
diff --git a/en/devices/input/key-character-map-files.html b/en/devices/input/key-character-map-files.html
index 803610e3..618f0014 100644
--- a/en/devices/input/key-character-map-files.html
+++ b/en/devices/input/key-character-map-files.html
@@ -38,14 +38,24 @@ choose a default instead.</p>
 id or by input device name.</p>
 <p>The following paths are consulted in order.</p>
 <ul>
+<li><code>/odm/usr/keychars/Vendor_XXXX_Product_XXXX_Version_XXXX.kcm</code></li>
+<li><code>/vendor/usr/keychars/Vendor_XXXX_Product_XXXX_Version_XXXX.kcm</code></li>
 <li><code>/system/usr/keychars/Vendor_XXXX_Product_XXXX_Version_XXXX.kcm</code></li>
-<li><code>/system/usr/keychars/Vendor_XXXX_Product_XXXX.kcm</code></li>
-<li><code>/system/usr/keychars/DEVICE_NAME.kcm</code></li>
 <li><code>/data/system/devices/keychars/Vendor_XXXX_Product_XXXX_Version_XXXX.kcm</code></li>
+<li><code>/odm/usr/keychars/Vendor_XXXX_Product_XXXX.kcm</code></li>
+<li><code>/vendor/usr/keychars/Vendor_XXXX_Product_XXXX.kcm</code></li>
+<li><code>/system/usr/keychars/Vendor_XXXX_Product_XXXX.kcm</code></li>
 <li><code>/data/system/devices/keychars/Vendor_XXXX_Product_XXXX.kcm</code></li>
+<li><code>/odm/usr/keychars/DEVICE_NAME.kcm</code></li>
+<li><code>/vendor/usr/keychars/DEVICE_NAME.kcm</code></li>
+<li><code>/system/usr/keychars/DEVICE_NAME.kcm</code></li>
 <li><code>/data/system/devices/keychars/DEVICE_NAME.kcm</code></li>
+<li><code>/odm/usr/keychars/Generic.kcm</code></li>
+<li><code>/vendor/usr/keychars/Generic.kcm</code></li>
 <li><code>/system/usr/keychars/Generic.kcm</code></li>
 <li><code>/data/system/devices/keychars/Generic.kcm</code></li>
+<li><code>/odm/usr/keychars/Virtual.kcm</code></li>
+<li><code>/vendor/usr/keychars/Virtual.kcm</code></li>
 <li><code>/system/usr/keychars/Virtual.kcm</code></li>
 <li><code>/data/system/devices/keychars/Virtual.kcm</code></li>
 </ul>
diff --git a/en/devices/input/key-layout-files.html b/en/devices/input/key-layout-files.html
index 486b4fcb..ed8aa6cd 100644
--- a/en/devices/input/key-layout-files.html
+++ b/en/devices/input/key-layout-files.html
@@ -39,12 +39,20 @@ default instead.</p>
 <p>Key layout files are located by USB vendor, product (and optionally version)
 id or by input device name. The following paths are consulted in order:</p>
 <ul>
+<li><code>/odm/usr/keylayout/Vendor_XXXX_Product_XXXX_Version_XXXX.kl</code></li>
+<li><code>/vendor/usr/keylayout/Vendor_XXXX_Product_XXXX_Version_XXXX.kl</code></li>
 <li><code>/system/usr/keylayout/Vendor_XXXX_Product_XXXX_Version_XXXX.kl</code></li>
-<li><code>/system/usr/keylayout/Vendor_XXXX_Product_XXXX.kl</code></li>
-<li><code>/system/usr/keylayout/DEVICE_NAME.kl</code></li>
 <li><code>/data/system/devices/keylayout/Vendor_XXXX_Product_XXXX_Version_XXXX.kl</code></li>
+<li><code>/odm/usr/keylayout/Vendor_XXXX_Product_XXXX.kl</code></li>
+<li><code>/vendor/usr/keylayout/Vendor_XXXX_Product_XXXX.kl</code></li>
+<li><code>/system/usr/keylayout/Vendor_XXXX_Product_XXXX.kl</code></li>
 <li><code>/data/system/devices/keylayout/Vendor_XXXX_Product_XXXX.kl</code></li>
+<li><code>/odm/usr/keylayout/DEVICE_NAME.kl</code></li>
+<li><code>/vendor/usr/keylayout/DEVICE_NAME.kl</code></li>
+<li><code>/system/usr/keylayout/DEVICE_NAME.kl</code></li>
 <li><code>/data/system/devices/keylayout/DEVICE_NAME.kl</code></li>
+<li><code>/odm/usr/keylayout/Generic.kl</code></li>
+<li><code>/vendor/usr/keylayout/Generic.kl</code></li>
 <li><code>/system/usr/keylayout/Generic.kl</code></li>
 <li><code>/data/system/devices/keylayout/Generic.kl</code></li>
 </ul>
diff --git a/en/reference/_toc.yaml b/en/reference/_toc.yaml
deleted file mode 100644
index e968aba4..00000000
--- a/en/reference/_toc.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-toc:
-- title: Reference
-  path: /reference/
-- title: HIDL
-  path: /reference/hidl/
-- title: Hardware Abstraction Layer (legacy)
-  path: /reference/hal/
-- title: Trade Federation
-  path: /reference/tradefed/
diff --git a/en/setup/start/build-numbers.html b/en/setup/start/build-numbers.html
index 9cda12fa..da4644b9 100644
--- a/en/setup/start/build-numbers.html
+++ b/en/setup/start/build-numbers.html
@@ -758,6 +758,12 @@ following table.
       <td>Nexus 6</td>
     </tr>
     <tr>
+      <td>N8I11F</td>
+      <td>android-7.1.1_r56</td>
+      <td>Nougat</td>
+      <td>Nexus 6</td>
+    </tr>
+    <tr>
       <td>N6F27M</td>
       <td>android-7.1.1_r55</td>
       <td>Nougat</td>