4 files changed, 88 insertions, 24 deletions
diff --git a/en/source/_toc.yaml b/en/source/_toc.yaml
index 74e92cc7..ee80c6ab 100644
--- a/en/source/_toc.yaml
+++ b/en/source/_toc.yaml
@@ -65,7 +65,7 @@ toc:
     path: /source/report-bugs
   - title: Reading Bug Reports
     path: /source/read-bug-reports
-  - title: Code Style Rules
+  - title: Java Code Style Rules
     path: /source/code-style
 - title: Community
   path: /source/community
diff --git a/en/source/code-style.html b/en/source/code-style.html
index b13feb4a..5367bd68 100644
--- a/en/source/code-style.html
+++ b/en/source/code-style.html
@@ -1,6 +1,6 @@
 <html devsite>
   <head>
-    <title>Code Style for Contributors</title>
+    <title>AOSP Java Code Style for Contributors</title>
     <meta name="project_path" value="/_project.yaml" />
     <meta name="book_path" value="/_book.yaml" />
   </head>
diff --git a/en/source/devices.html b/en/source/devices.html
index 0e1b3cb3..53efcf40 100644
--- a/en/source/devices.html
+++ b/en/source/devices.html
@@ -32,7 +32,7 @@ Tags, and Builds</a>.</p>
 Android 4.1.1 on a Nexus 7 originally sold with Android 4.1.2 or later.</p>
 
 <p>You can also create builds for
-<a href="https://android.googlesource.com/device/linaro/hikey/">HiKey</a>
+<a href="https://android.googlesource.com/device/linaro/hikey/" class="external">HiKey</a>
 Android reference boards, which are designed to help non-Nexus component vendors
 develop and port drivers to Android releases. Using a reference board can ease
 upgrade efforts, reduce time-to-market for new Android devices, lower device
@@ -41,31 +41,34 @@ components, and increase the speed of innovation among component suppliers.</p>
 
 <p>Google supports <a href="#960hikey">HiKey960</a> and
 <a href="#620hikey">HiKey</a> certified
-<a href="https://www.96boards.org/products/ce/hikey/">96Boards</a> as Android
-reference boards. AOSP provides kernel source and board support for HiKey so
-developers can easily create and debug new and existing peripheral drivers, do
-kernel development, and perform other tasks with fewer OEM encumbrances.</p>
-
+<a href="https://www.96boards.org/products/ce/" class="external">96Boards</a>
+as Android reference boards. AOSP provides kernel source and board support for
+HiKey so developers can easily create and debug new and existing peripheral
+drivers, do kernel development, and perform other tasks with fewer OEM
+encumbrances. To develop new ContextHub features that use new sensors or LEDs,
+you can also use a <a href="#neonkey">Neonkey SensorHub</a> connected to a HiKey
+or HiKey960 development board.</p>
 
 <h2 id="960hikey">HiKey960 boards</h2>
 
 <p>The HiKey960 board is available in a 3GB RAM configuration from LeMaker (via
-<a href="https://www.amazon.com/dp/B071RD3V34">Amazon.com</a>) and from
-<a href=" http://www.lenovator.com/product/132.html">Lenovator<a/>.</a></p>
+<a href="https://www.amazon.com/dp/B071RD3V34" class="external">Amazon.com</a>)
+and from <a href="http://www.lenovator.com/product/80.html" class="external">Lenovator<a/>.
+</p>
 
 <img src="images/hikey960.png" alt="HiKey960 board image" />
-<p class="img-caption"><strong>Figure 2.</strong> HiKey960 board by Lenovator</p>
+<figcaption><strong>Figure 1.</strong> HiKey960 board by Lenovator</figcaption>
 
 <p>Additional resources:</p>
 <ul>
 <li>
-<a href="https://github.com/96boards/documentation/blob/master/ConsumerEdition/HiKey960/HardwareDocs/HiKey960_Schematics.pdf">HiKey960
+<a href="https://github.com/96boards/documentation/blob/master/ConsumerEdition/HiKey960/HardwareDocs/HiKey960_Schematics.pdf" class="external">HiKey960
 schematics</a></li>
 <li>
-<a href="http://www.96boards.org/documentation/ConsumerEdition/HiKey960/HardwareDocs/HardwareUserManual.md/">HiKey960
+<a href="http://www.96boards.org/documentation/ConsumerEdition/HiKey960/HardwareDocs/HardwareUserManual.md/" class="external">HiKey960
 user guide</a></li>
 <li>
-<a href="https://github.com/96boards/documentation/wiki/">96boards wiki</a></li>
+<a href="https://github.com/96boards/documentation/wiki/" class="external">96boards wiki</a></li>
 </ul>
 
 <p>Use the following commands to download, build, and run Android on the
@@ -164,22 +167,24 @@ Example setting for a 24" monitor is <code>video=HDMI-A-1:1280x800@60</code>.
 <h2 id="620hikey">HiKey boards</h2>
 
 <p>The HiKey board (also known as HiKey620) is available in
-<a href="http://www.lenovator.com/product/86.html">1GB RAM</a> and
-<a href="http://www.lenovator.com/product/90.html">2GB RAM</a> configurations
-from <a href="http://www.lenovator.com">Lenovator</a>:</p>
+<a href="http://www.lenovator.com/product/86.html" class="external">1GB RAM</a>
+and <a href="http://www.lenovator.com/product/90.html" class="external">2GB
+RAM</a> configurations from <a href="http://www.lenovator.com" class="external">Lenovator</a>:
+</p>
 
-<img src="images/hikey620.png" alt="HiKey620 board image" />
-<p class="img-caption"><strong>Figure 1.</strong> HiKey board by Lenovator</p>
+<img src="images/hikey620.png" alt="HiKey620 board image"/>
+<figcaption><strong>Figure 2.</strong> HiKey board by Lenovator</figcaption>
 
 <p>Additional resources:</p>
 <ul>
 <li>
-<a href="https://github.com/96boards/documentation/blob/master/ConsumerEdition/HiKey960/HardwareDocs/HiKey960_Schematics.pdf">HiKey
+<a href="https://github.com/96boards/documentation/blob/master/ConsumerEdition/HiKey/HardwareDocs/HiKey_schematics_LeMaker_version_Rev_A1.pdf" class="external">HiKey
 schematics</a></li>
 <li>
-<a href="http://www.96boards.org/documentation/ConsumerEdition/HiKey960/HardwareDocs/HardwareUserManual.md/">HiKey
+<a href="https://www.96boards.org/wp-content/uploads/2015/02/HiKey_User_Guide_Rev0.2.pdf" class="external">HiKey
 user guide</a></li>
-<li><a href="https://github.com/96boards/documentation/wiki/">96boards wiki</a></li>
+<li><a href="https://github.com/96boards/documentation/wiki/" class="external">96boards
+wiki</a></li>
 </ul>
 
 <p>Use the following commands to download, build, and run Android on the HiKey
@@ -221,7 +226,7 @@ use: <code>$ make -j32 TARGET_USERDATAIMAGE_4GB=true</code>.</p>
 <ol>
   <li>Select special bootloader mode by linking J15 1-2 and 3-4 pins (for details,
 refer to the
-<a href="https://www.96boards.org/wp-content/uploads/2015/02/HiKey_User_Guide_Rev0.2.pdf">HiKey
+<a href="https://www.96boards.org/wp-content/uploads/2015/02/HiKey_User_Guide_Rev0.2.pdf" class="external">HiKey
 user guide</a>).</li>
   <li>Connect USB to PC to get ttyUSB device (ex: <code>/dev/ttyUSB1</code>).</li>
   <li>Power the board:
@@ -278,8 +283,67 @@ Example setting for a 24" monitor: <code>video=HDMI-A-1:1280x800@60</code>.</p>
 <h3 id="620serial">Configuring kernel serial output (uart3)</h3>
 <p>Set the J2 low speed expansion connector to 1 - Gnd, 11 - Rx, 13 - Tx. For
 details, refer to the
-<a href="https://www.96boards.org/wp-content/uploads/2015/02/HiKey_User_Guide_Rev0.2.pdf">HiKey
+<a href="https://www.96boards.org/wp-content/uploads/2015/02/HiKey_User_Guide_Rev0.2.pdf" class="external">HiKey
 user guide</a>.</p>
 
+<h2 id="neonkey">Neonkey SensorHub</h2>
+<p>To develop new ContextHub features that use new sensors or LEDs, you can use
+<a href="http://www.96boards.org/product/neonkey/" class="external">Neonkey
+SensorHub</a> connected to a Hikey or Hikey960 development board.</p>
+
+<img src="images/neonkey-sensorhub.png" alt="Neonkey Sensorhub image" />
+<figcaption><strong>Figure 3.</strong> Neonkey SensorHub</figcaption>
+
+<p>Neonkey is a certified <a href="http://www.96boards.org/" class="external">96Boards</a>
+mezzanine base on STM32F411CE with the following components:</p>
+
+<ul>
+<li>Pressure sensor: BMP280</li>
+<li>ALS/Proximity sensor: RPR-0521RS</li>
+<li>ARM Hall sensor: MRMS501A</li>
+<li>LED driver with 15 LEDs: LP3943</li>
+<li>Accel/Gyro + Geomagnetic sensors: BMI160 + BMM150</li>
+<li>Temp/Humidity sensor: SI7034-A10</li>
+<li>4 GPIO-driven LEDs, I2C expansion, GPIO (2 lines) expansion, JTAG connector</li>
+<li>NOR Flash: 512KB</li>
+<li>SRAM: 128 KB, 96boards LS Expansion connector</li>
+</ul>
+
+<p>Kernel source and ContextHub board support is available in AOSP to help
+developers create and debug new sensors, make new HAL and kernel changes, etc.
+with fewer OEM encumbrances.</p>
+
+<p>To build, enable, and upload Neonkey:</p>
+
+<ol>
+<li>Pull AOSP source:
+<pre class="devsite-terminal">
+repo init -u https://android.googlesource.com/platform/manifest -b master &amp; repo sync -j24
+</pre>
+</li>
+<li>Build:
+<pre class="devsite-click-to-copy">
+<code class="devsite-terminal">. ./build/envsetup.sh</code>
+<code class="devsite-terminal">lunch hikey-userdebug</code>
+<code class="devsite-terminal">. device/google/contexthub/firmware/toolchain-setup.sh</code>
+<code class="devsite-terminal">command make -C device/google/contexthub/firmware/variant/neonkey</code>
+<code class="devsite-terminal">adb push device/google/contexthub/firmware/out/nanohub/neonkey/full.bin /data/local/tmp</code>
+</pre>
+</li>
+<li>To enable Neonkey, enter boot mode using one of the following methods:
+<ul>
+<li>Connect BOOT0 to 1V8 (link JTAG P4 1-5 pins)</li>
+<li>Hold USR button</li>
+<li>Push RST button</li>
+</ul>
+</li>
+<li>To upload the firmware:
+<pre class="devsite-click-to-copy">
+<code class="devsite-terminal">adb root</code>
+<code class="devsite-terminal">adb shell stm32_flash -u -d /dev/ttyAMA2 -e 0xffff -w /data/local/tmp/full.bin</code>
+</pre>
+</li>
+</ol>
+
   </body>
 </html>
diff --git a/en/source/images/neonkey-sensorhub.png b/en/source/images/neonkey-sensorhub.png
new file mode 100644
index 00000000..61f4e22b
--- /dev/null
+++ b/en/source/images/neonkey-sensorhub.png