am 70c53477: am 3b41843a: Version numbers for 4.3, instructions for flo/deb

* commit '70c53477bc4ee1a1ef6e91365676e24719afdcc5':
  Version numbers for 4.3, instructions for flo/deb

3 files changed, 59 insertions, 12 deletions

diff --git a/src/source/build-numbers.jd b/src/source/build-numbers.jd
index af80f13f..886ebf63 100644
--- a/src/source/build-numbers.jd
+++ b/src/source/build-numbers.jd
@@ -430,6 +430,12 @@ following table:</p>
 </tr>
 
 <tr>
+<td>JZO54M</td>
+<td>android-4.1.2_r2.1</td>
+<td></td>
+</tr>
+
+<tr>
 <td>JOP40C</td>
 <td>android-4.2_r1</td>
 <td>Galaxy Nexus, Nexus 7, Nexus 4, Nexus 10</td>
@@ -473,14 +479,26 @@ following table:</p>
 
 <tr>
 <td>JWR66L</td>
-<td>android-4.3_r0.9</td>
+<td>android-4.3_w_r0.8</td>
 <td>Nexus 7</td>
 </tr>
 
 <tr>
 <td>JWR66N</td>
-<td>android-4.3_r1</td>
-<td>latest Jelly Bean version, Galaxy Nexus, Nexus 7, Nexus 4, Nexus 10</td>
+<td>android-4.3_w_r0.9</td>
+<td>Galaxy Nexus, Nexus 7, Nexus 4, Nexus 10</td>
+</tr>
+
+<tr>
+<td>JWR66V</td>
+<td>android-4.3_w_r1</td>
+<td>Galaxy Nexus, Nexus 7 (grouper/tilapia), Nexus 4, Nexus 10</td>
+</tr>
+
+<tr>
+<td>JSS15F</td>
+<td>android-4.3_s_r1</td>
+<td>latest Jelly Bean version, Nexus 7 (flo/deb)</td>
 </tr>
 
 </tbody>
diff --git a/src/source/building-devices.jd b/src/source/building-devices.jd
index 5bb2f2c6..3b227a89 100644
--- a/src/source/building-devices.jd
+++ b/src/source/building-devices.jd
@@ -32,8 +32,7 @@ information that is specific to individual devices.</p>
 Nexus 4, Nexus 7, and for some variants of Galaxy Nexus.
 The exact level of functionality for each device depends on the availability
 of the relevant proprietary hardware-specific binaries.</p>
-<p>For Nexus 4 "mako" and on Nexus 7 "grouper" (Wi-Fi) and "tilapia" (Mobile),
-all configurations can be used,
+<p>For Nexus 4 and Nexus 7, all configurations can be used,
 and all the hardware is functional.
 Due to hardware differences, do not use 4.1.1 on a Nexus 7 that
 was originally sold with 4.1.2 or newer.</p>
@@ -77,6 +76,14 @@ which is a mode in the bootloader that can be used to flash the devices:</p>
 </thead>
 <tbody>
 <tr>
+<td>flo</td>
+<td>Press and hold <em>Volume Down</em>, then press and hold <em>Power</em></td>
+</tr>
+<tr>
+<td>deb</td>
+<td>Press and hold <em>Volume Down</em>, then press and hold <em>Power</em></td>
+</tr>
+<tr>
 <td>manta</td>
 <td>Press and hold both <em>Volume Up</em> and <em>Volume Down</em>, then press and hold <em>Power</em></td>
 </tr>
@@ -186,33 +193,43 @@ the lunch menu, accessed when running the <code>lunch</code> command with no arg
 </thead>
 <tbody>
 <tr>
+<td>flo</td>
+<td>android-4.3_s_r1 or master</td>
+<td>aosp_flo-userdebug</td>
+</tr>
+<tr>
+<td>deb</td>
+<td>android-4.3_s_r1 or master</td>
+<td>aosp_deb-userdebug</td>
+</tr>
+<tr>
 <td>manta</td>
 <td>android-4.2.2_r1</td>
 <td>full_manta-userdebug</td>
 </tr>
 <tr>
 <td>mako</td>
-<td>android-4.3_r1 or master</td>
+<td>android-4.3_w_r1 or master</td>
 <td>aosp_mako-userdebug</td>
 </tr>
 <tr>
 <td>grouper</td>
-<td>android-4.3_r1 or master</td>
+<td>android-4.3_w_r1 or master</td>
 <td>aosp_grouper-userdebug</td>
 </tr>
 <tr>
 <td>tilapia</td>
-<td>android-4.3_r1 or master</td>
-<td>aosp_grouper-userdebug</td>
+<td>android-4.3_w_r1 or master</td>
+<td>aosp_tilapia-userdebug</td>
 </tr>
 <tr>
 <td>maguro</td>
-<td>android-4.3_r1 or master</td>
+<td>android-4.3_w_r1 or master</td>
 <td>aosp_maguro-userdebug</td>
 </tr>
 <tr>
 <td>toro</td>
-<td>android-4.3_r1 or master</td>
+<td>android-4.3_w_r1 or master</td>
 <td>aosp_toro-userdebug</td>
 </tr>
 <tr>
diff --git a/src/source/building-kernels.jd b/src/source/building-kernels.jd
index 3cc6c1e5..092e3d33 100644
--- a/src/source/building-kernels.jd
+++ b/src/source/building-kernels.jd
@@ -40,6 +40,18 @@ clone steps other than the step to download the actual kernel sources.</p>
     <th>Build configuration</th>
   </tr>
   <tr>
+    <td>flo</td>
+    <td>device/asus/flo-kernel/kernel</td>
+    <td>kernel/msm</td>
+    <td>flo_defconfig</td>
+  </tr>
+  <tr>
+    <td>deb</td>
+    <td>device/asus/flo-kernel/kernel</td>
+    <td>kernel/msm</td>
+    <td>flo_defconfig</td>
+  </tr>
+  <tr>
     <td>manta</td>
     <td>device/samsung/manta/kernel</td>
     <td>kernel/exynos</td>
@@ -173,4 +185,4 @@ instances of "panda" with "tuna".</p>
 <p>
 The kernel binary is output as `arch/arm/boot/zImage`, and needs to be copied
 into the Android source tree in order to build the matching boot image.
-</p>
\ No newline at end of file
+</p>