diff --git a/camera/docs/docs.html b/camera/docs/docs.html
index b0724ee..0f1cbec 100644
--- a/camera/docs/docs.html
+++ b/camera/docs/docs.html
@@ -28,6 +28,7 @@
     .section { color: #eeeeee; font-size: 1.5em; font-weight: bold; background-color: #888888; padding: 0.5em 0em 0.5em 0.5em; border-width: thick thin thin thin; border-color: #111111 #777777 #777777 #777777}
     .kind { color: #eeeeee; font-size: 1.2em; font-weight: bold; padding-left: 1.5em; background-color: #aaaaaa }
     .entry { background-color: #f0f0f0 }
+    .entry_cont { background-color: #f0f0f0 }
     .entries_header { background-color: #dddddd; text-align: center}
 
     /* toc style */
@@ -40,7 +41,7 @@
     .th_name { width: 20% }
     .th_units { width: 10% }
     .th_tags { width: 5% }
-    .th_notes { width: 25% }
+    .th_details { width: 25% }
     .th_type { width: 20% }
     .th_description { width: 20% }
     .th_range { width: 10% }
@@ -50,7 +51,7 @@
     .thead_dummy { visibility: hidden; }
 
     /* Entry flair */
-    .entry_name { color: #333333; padding-left:1.0em; font-size:1.1em; font-family: monospace; }
+    .entry_name { color: #333333; padding-left:1.0em; font-size:1.1em; font-family: monospace; vertical-align:top; }
 
     /* Entry type flair */
     .entry_type_name { font-size:1.1em; color: #669900; font-weight: bold;}
@@ -63,11 +64,15 @@
     .entry ul { margin: 0 0 0 0; list-style-position: inside; padding-left: 0.5em; }
     .entry ul li { padding: 0 0 0 0; margin: 0 0 0 0;}
 
-    /* Entry visibility flair */
-
     /* Entry tags flair */
     .entry_tags ul { list-style-type: none; }
 
+    /* Entry details (full docs) flair */
+    .entry_details_header { font-weight: bold; background-color: #dddddd;
+      text-align: center; font-size: 1.1em; margin-left: 0em; margin-right: 0em; }
+
+    /* Entry spacer flair */
+    .entry_spacer { background-color: transparent; border-style: none; height: 0.5em; }
 
     /* TODO: generate abbr element for each tag link? */
     /* TODO for each x.y.z try to link it to the entry */
@@ -666,16 +671,15 @@
         <th class="th_description">Description</th>
         <th class="th_units">Units</th>
         <th class="th_range">Range</th>
-        <th class="th_notes">Notes</th>
         <th class="th_tags">Tags</th>
       </tr>
     </thead> <!-- so that the first occurrence of thead is not
                          above the first occurrence of tr -->
 <!-- <namespace name="android"> -->
-  <tr><td colspan="7" id="section_colorCorrection" class="section">colorCorrection</td></tr>
+  <tr><td colspan="6" id="section_colorCorrection" class="section">colorCorrection</td></tr>
 
 
-      <tr><td colspan="7" class="kind">controls</td></tr>
+      <tr><td colspan="6" class="kind">controls</td></tr>
 
       <thead class="entries_header">
         <tr>
@@ -684,7 +688,6 @@
           <th class="th_description">Description</th>
           <th class="th_units">Units</th>
           <th class="th_range">Range</th>
-          <th class="th_notes">Notes</th>
           <th class="th_tags">Tags</th>
         </tr>
       </thead>
@@ -701,7 +704,9 @@
 
                 
           <tr class="entry" id="controls_android.colorCorrection.mode">
-            <td class="entry_name"><html><body><p>android.colorCorrection.mode<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.colorCorrection.mode<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -736,19 +741,27 @@
             <td class="entry_range">
             </td>
 
-            <td class="entry_notes">
-              <html><body><p>When android.control.awbMode is not OFF, TRANSFORM_MATRIX
-should be ignored.<wbr></wbr></p></body></html>
-            </td>
-
             <td class="entry_tags">
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
+              <html><body><p>When android.control.awbMode is not OFF, TRANSFORM_MATRIX
+should be ignored.<wbr></wbr></p></body></html>
+            </td>
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="controls_android.colorCorrection.transform">
-            <td class="entry_name"><html><body><p>android.colorCorrection.transform<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.colorCorrection.transform<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">rational</span>
                 <span class="entry_type_container">x</span>
@@ -775,7 +788,15 @@
           (0,1)<wbr></wbr></p></body></html>
             </td>
 
-            <td class="entry_notes">
+            <td class="entry_tags">
+            </td>
+
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
               <html><body><p>This matrix is either set by HAL when the request
 android.colorCorrection.mode is not TRANSFORM_MATRIX, or
 directly by the application in the request when the
@@ -784,15 +805,15 @@
 for precision issues; the final rounded matrix should be
 reported back in this matrix result metadata.<wbr></wbr></p></body></html>
             </td>
-
-            <td class="entry_tags">
-            </td>
-
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="controls_android.colorCorrection.gains">
-            <td class="entry_name"><html><body><p>android.colorCorrection.gains<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.colorCorrection.gains<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">float</span>
                 <span class="entry_type_container">x</span>
@@ -817,7 +838,15 @@
             <td class="entry_range">
             </td>
 
-            <td class="entry_notes">
+            <td class="entry_tags">
+            </td>
+
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
               <html><body><p>The 4-channel white-balance gains are defined in
 the order of [R G_even G_odd B], where G_even is the gain
 for green pixels on even rows of the output, and G_odd
@@ -832,17 +861,15 @@
 <p>The ouput should be the gains actually applied by the HAL to
 the current frame.<wbr></wbr></p></body></html>
             </td>
-
-            <td class="entry_tags">
-            </td>
-
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
         
 
       <!-- end of kind -->
       </tbody>
-      <tr><td colspan="7" class="kind">dynamic</td></tr>
+      <tr><td colspan="6" class="kind">dynamic</td></tr>
 
       <thead class="entries_header">
         <tr>
@@ -851,7 +878,6 @@
           <th class="th_description">Description</th>
           <th class="th_units">Units</th>
           <th class="th_range">Range</th>
-          <th class="th_notes">Notes</th>
           <th class="th_tags">Tags</th>
         </tr>
       </thead>
@@ -868,7 +894,9 @@
 
                 
           <tr class="entry" id="dynamic_android.colorCorrection.transform">
-            <td class="entry_name"><html><body><p>android.colorCorrection.transform<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.colorCorrection.transform<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">rational</span>
                 <span class="entry_type_container">x</span>
@@ -895,7 +923,15 @@
           (0,1)<wbr></wbr></p></body></html>
             </td>
 
-            <td class="entry_notes">
+            <td class="entry_tags">
+            </td>
+
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
               <html><body><p>This matrix is either set by HAL when the request
 android.colorCorrection.mode is not TRANSFORM_MATRIX, or
 directly by the application in the request when the
@@ -904,15 +940,15 @@
 for precision issues; the final rounded matrix should be
 reported back in this matrix result metadata.<wbr></wbr></p></body></html>
             </td>
-
-            <td class="entry_tags">
-            </td>
-
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="dynamic_android.colorCorrection.gains">
-            <td class="entry_name"><html><body><p>android.colorCorrection.gains<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.colorCorrection.gains<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">float</span>
                 <span class="entry_type_container">x</span>
@@ -937,7 +973,15 @@
             <td class="entry_range">
             </td>
 
-            <td class="entry_notes">
+            <td class="entry_tags">
+            </td>
+
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
               <html><body><p>The 4-channel white-balance gains are defined in
 the order of [R G_even G_odd B], where G_even is the gain
 for green pixels on even rows of the output, and G_odd
@@ -952,11 +996,9 @@
 <p>The ouput should be the gains actually applied by the HAL to
 the current frame.<wbr></wbr></p></body></html>
             </td>
-
-            <td class="entry_tags">
-            </td>
-
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
         
 
@@ -964,10 +1006,10 @@
       </tbody>
 
   <!-- end of section -->
-  <tr><td colspan="7" id="section_control" class="section">control</td></tr>
+  <tr><td colspan="6" id="section_control" class="section">control</td></tr>
 
 
-      <tr><td colspan="7" class="kind">controls</td></tr>
+      <tr><td colspan="6" class="kind">controls</td></tr>
 
       <thead class="entries_header">
         <tr>
@@ -976,7 +1018,6 @@
           <th class="th_description">Description</th>
           <th class="th_units">Units</th>
           <th class="th_range">Range</th>
-          <th class="th_notes">Notes</th>
           <th class="th_tags">Tags</th>
         </tr>
       </thead>
@@ -993,7 +1034,8 @@
 
                 
           <tr class="entry" id="controls_android.control.aeAntibandingMode">
-            <td class="entry_name"><html><body><p>android.control.aeAntibandingMode<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                ><html><body><p>android.control.aeAntibandingMode<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -1028,17 +1070,18 @@
               <html><body><p>android.control.aeAvailableAntibandingModes<wbr></wbr></p></body></html>
             </td>
 
-            <td class="entry_notes">
-            </td>
-
             <td class="entry_tags">
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="controls_android.control.aeExposureCompensation">
-            <td class="entry_name"><html><body><p>android.control.aeExposureCompensation<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.control.aeExposureCompensation<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
 
@@ -1059,23 +1102,31 @@
             <td class="entry_range">
             </td>
 
-            <td class="entry_notes">
-              <html><body><p>For example, if EV step is 0.333, '6' will mean an
-exposure compensation of +2 EV; -3 will mean an exposure
-compensation of -1<wbr></wbr></p></body></html>
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
+              <html><body><p>For example, if EV step is 0.333, '6' will mean an
+exposure compensation of +2 EV; -3 will mean an exposure
+compensation of -1<wbr></wbr></p></body></html>
+            </td>
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="controls_android.control.aeLock">
-            <td class="entry_name"><html><body><p>android.control.aeLock<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.control.aeLock<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -1108,23 +1159,31 @@
             <td class="entry_range">
             </td>
 
-            <td class="entry_notes">
-              <html><body><p>Note that even when AE is locked, the flash may be
-fired if the AE mode is ON_AUTO_FLASH / ON_ALWAYS_FLASH /
-ON_AUTO_FLASH_REDEYE.<wbr></wbr></p></body></html>
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
+              <html><body><p>Note that even when AE is locked, the flash may be
+fired if the AE mode is ON_AUTO_FLASH / ON_ALWAYS_FLASH /
+ON_AUTO_FLASH_REDEYE.<wbr></wbr></p></body></html>
+            </td>
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="controls_android.control.aeMode">
-            <td class="entry_name"><html><body><p>android.control.aeMode<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.control.aeMode<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -1178,7 +1237,18 @@
               <html><body><p>android.control.aeAvailableModes<wbr></wbr></p></body></html>
             </td>
 
-            <td class="entry_notes">
+            <td class="entry_tags">
+              <ul class="entry_tags">
+                  <li><a href="#tag_BC">BC</a></li>
+              </ul>
+            </td>
+
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
               <html><body><p>Only effective if android.control.mode = AUTO.</p>
 <p>If auto-exposure is active, HAL auto-focus routine is enabled,
 then HAL auto-exposure routine overrides the control variables
@@ -1189,18 +1259,15 @@
 the flash fields, depending on AE mode) of the request.  The overridden
 values are then provided back to the user in the corresponding result.<wbr></wbr></p></body></html>
             </td>
-
-            <td class="entry_tags">
-              <ul class="entry_tags">
-                  <li><a href="#tag_BC">BC</a></li>
-              </ul>
-            </td>
-
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="controls_android.control.aeRegions">
-            <td class="entry_name"><html><body><p>android.control.aeRegions<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.control.aeRegions<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
                 <span class="entry_type_container">x</span>
@@ -1224,7 +1291,18 @@
             <td class="entry_range">
             </td>
 
-            <td class="entry_notes">
+            <td class="entry_tags">
+              <ul class="entry_tags">
+                  <li><a href="#tag_BC">BC</a></li>
+              </ul>
+            </td>
+
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
               <html><body><p>Each area is a rectangle plus weight: xmin, ymin,
 xmax, ymax, weight. The rectangle is defined inclusive of the
 specified coordinates.</p>
@@ -1240,18 +1318,15 @@
 should ignore the sections outside the region and output the
 used sections in the frame metadata<wbr></wbr></p></body></html>
             </td>
-
-            <td class="entry_tags">
-              <ul class="entry_tags">
-                  <li><a href="#tag_BC">BC</a></li>
-              </ul>
-            </td>
-
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="controls_android.control.aeTargetFpsRange">
-            <td class="entry_name"><html><body><p>android.control.aeTargetFpsRange<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.control.aeTargetFpsRange<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
                 <span class="entry_type_container">x</span>
@@ -1276,22 +1351,30 @@
               <html><body><p>android.control.aeAvailableTargetFpsRanges<wbr></wbr></p></body></html>
             </td>
 
-            <td class="entry_notes">
-              <html><body><p>Only constrains AE algorithm, not manual control
-of android.sensor.exposureTime<wbr></wbr></p></body></html>
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
+              <html><body><p>Only constrains AE algorithm, not manual control
+of android.sensor.exposureTime<wbr></wbr></p></body></html>
+            </td>
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="controls_android.control.aePrecaptureTrigger">
-            <td class="entry_name"><html><body><p>android.control.aePrecaptureTrigger<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.control.aePrecaptureTrigger<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -1324,7 +1407,18 @@
             <td class="entry_range">
             </td>
 
-            <td class="entry_notes">
+            <td class="entry_tags">
+              <ul class="entry_tags">
+                  <li><a href="#tag_BC">BC</a></li>
+              </ul>
+            </td>
+
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
               <html><body><p>This entry is normally set to IDLE, or is not
 included at all in the request settings. When included and
 set to START, the HAL must trigger the autoexposure
@@ -1333,18 +1427,15 @@
 AE mode and state; see the camera HAL device v3 header for
 details.<wbr></wbr></p></body></html>
             </td>
-
-            <td class="entry_tags">
-              <ul class="entry_tags">
-                  <li><a href="#tag_BC">BC</a></li>
-              </ul>
-            </td>
-
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="controls_android.control.afMode">
-            <td class="entry_name"><html><body><p>android.control.afMode<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.control.afMode<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -1445,24 +1536,32 @@
             <td class="entry_range">
             </td>
 
-            <td class="entry_notes">
-              <html><body><p>Only effective if android.control.mode = AUTO.</p>
-<p>If lens is controlled by HAL auto-focus algorithm, the HAL should
-report the current AF status in android.control.afState in
-result metadata.<wbr></wbr></p></body></html>
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
+              <html><body><p>Only effective if android.control.mode = AUTO.</p>
+<p>If lens is controlled by HAL auto-focus algorithm, the HAL should
+report the current AF status in android.control.afState in
+result metadata.<wbr></wbr></p></body></html>
+            </td>
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="controls_android.control.afRegions">
-            <td class="entry_name"><html><body><p>android.control.afRegions<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.control.afRegions<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
                 <span class="entry_type_container">x</span>
@@ -1486,7 +1585,18 @@
             <td class="entry_range">
             </td>
 
-            <td class="entry_notes">
+            <td class="entry_tags">
+              <ul class="entry_tags">
+                  <li><a href="#tag_BC">BC</a></li>
+              </ul>
+            </td>
+
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
               <html><body><p>Each area is a rectangle plus weight: xmin, ymin,
 xmax, ymax, weight. The rectangle is defined inclusive of the
 specified coordinates.</p>
@@ -1502,18 +1612,15 @@
 should ignore the sections outside the region and output the
 used sections in the frame metadata<wbr></wbr></p></body></html>
             </td>
-
-            <td class="entry_tags">
-              <ul class="entry_tags">
-                  <li><a href="#tag_BC">BC</a></li>
-              </ul>
-            </td>
-
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="controls_android.control.afTrigger">
-            <td class="entry_name"><html><body><p>android.control.afTrigger<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.control.afTrigger<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -1547,7 +1654,18 @@
             <td class="entry_range">
             </td>
 
-            <td class="entry_notes">
+            <td class="entry_tags">
+              <ul class="entry_tags">
+                  <li><a href="#tag_BC">BC</a></li>
+              </ul>
+            </td>
+
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
               <html><body><p>This entry is normally set to IDLE, or is not
 included at all in the request settings.</p>
 <p>When included and set to START, the HAL must trigger the
@@ -1556,18 +1674,15 @@
 header for details. When set to CANCEL, the HAL must cancel
 any active trigger, and return to initial AF state.<wbr></wbr></p></body></html>
             </td>
-
-            <td class="entry_tags">
-              <ul class="entry_tags">
-                  <li><a href="#tag_BC">BC</a></li>
-              </ul>
-            </td>
-
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="controls_android.control.awbLock">
-            <td class="entry_name"><html><body><p>android.control.awbLock<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.control.awbLock<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -1601,23 +1716,31 @@
             <td class="entry_range">
             </td>
 
-            <td class="entry_notes">
-              <html><body><p>Note that AWB lock is only meaningful for AUTO
-mode; in other modes, AWB is already fixed to a specific
-setting<wbr></wbr></p></body></html>
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
+              <html><body><p>Note that AWB lock is only meaningful for AUTO
+mode; in other modes, AWB is already fixed to a specific
+setting<wbr></wbr></p></body></html>
+            </td>
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="controls_android.control.awbMode">
-            <td class="entry_name"><html><body><p>android.control.awbMode<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.control.awbMode<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -1667,11 +1790,6 @@
             <td class="entry_range">
             </td>
 
-            <td class="entry_notes">
-              <html><body><p>[BC - AWB lock,AWB modes]</p>
-<p>Only effective if android.control.mode = AUTO.<wbr></wbr></p></body></html>
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_BC">BC</a></li>
@@ -1679,11 +1797,24 @@
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
+              <html><body><p>[BC - AWB lock,AWB modes]</p>
+<p>Only effective if android.control.mode = AUTO.<wbr></wbr></p></body></html>
+            </td>
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="controls_android.control.awbRegions">
-            <td class="entry_name"><html><body><p>android.control.awbRegions<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.control.awbRegions<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
                 <span class="entry_type_container">x</span>
@@ -1707,7 +1838,18 @@
             <td class="entry_range">
             </td>
 
-            <td class="entry_notes">
+            <td class="entry_tags">
+              <ul class="entry_tags">
+                  <li><a href="#tag_BC">BC</a></li>
+              </ul>
+            </td>
+
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
               <html><body><p>Only used in AUTO mode.</p>
 <p>Each area is a rectangle plus weight: xmin, ymin,
 xmax, ymax, weight. The rectangle is defined inclusive of the
@@ -1724,18 +1866,15 @@
 should ignore the sections outside the region and output the
 used sections in the frame metadata<wbr></wbr></p></body></html>
             </td>
-
-            <td class="entry_tags">
-              <ul class="entry_tags">
-                  <li><a href="#tag_BC">BC</a></li>
-              </ul>
-            </td>
-
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="controls_android.control.captureIntent">
-            <td class="entry_name"><html><body><p>android.control.captureIntent<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.control.captureIntent<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -1793,21 +1932,28 @@
               <html><body><p>all must be supported<wbr></wbr></p></body></html>
             </td>
 
-            <td class="entry_notes">
-              <html><body><p>Only used if android.control.mode != OFF.<wbr></wbr></p></body></html>
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
+              <html><body><p>Only used if android.control.mode != OFF.<wbr></wbr></p></body></html>
+            </td>
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="controls_android.control.effectMode">
-            <td class="entry_name"><html><body><p>android.control.effectMode<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                ><html><body><p>android.control.effectMode<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -1865,20 +2011,21 @@
               <html><body><p>android.control.availableEffects<wbr></wbr></p></body></html>
             </td>
 
-            <td class="entry_notes">
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="controls_android.control.mode">
-            <td class="entry_name"><html><body><p>android.control.mode<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.control.mode<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -1924,7 +2071,18 @@
               <html><body><p>all must be supported<wbr></wbr></p></body></html>
             </td>
 
-            <td class="entry_notes">
+            <td class="entry_tags">
+              <ul class="entry_tags">
+                  <li><a href="#tag_BC">BC</a></li>
+              </ul>
+            </td>
+
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
               <html><body><p>High-level 3A control. When set to OFF, all 3A control
 by the HAL is disabled. The application must set the fields for
 capture parameters itself.</p>
@@ -1936,18 +2094,14 @@
 as it wishes. The HAL scene mode 3A settings are provided by
 android.control.sceneModeOverrides.<wbr></wbr></p></body></html>
             </td>
-
-            <td class="entry_tags">
-              <ul class="entry_tags">
-                  <li><a href="#tag_BC">BC</a></li>
-              </ul>
-            </td>
-
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="controls_android.control.sceneMode">
-            <td class="entry_name"><html><body><p>android.control.sceneMode<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                ><html><body><p>android.control.sceneMode<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -2047,20 +2201,21 @@
               <html><body><p>android.control.availableSceneModes<wbr></wbr></p></body></html>
             </td>
 
-            <td class="entry_notes">
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="controls_android.control.videoStabilizationMode">
-            <td class="entry_name"><html><body><p>android.control.videoStabilizationMode<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.control.videoStabilizationMode<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -2088,25 +2243,31 @@
             <td class="entry_range">
             </td>
 
-            <td class="entry_notes">
-              <html><body><p>If enabled, video stabilization can modify the
-android.scaler.cropRegion to keep the video stream
-stabilized<wbr></wbr></p></body></html>
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
+              <html><body><p>If enabled, video stabilization can modify the
+android.scaler.cropRegion to keep the video stream
+stabilized<wbr></wbr></p></body></html>
+            </td>
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
         
 
       <!-- end of kind -->
       </tbody>
-      <tr><td colspan="7" class="kind">static</td></tr>
+      <tr><td colspan="6" class="kind">static</td></tr>
 
       <thead class="entries_header">
         <tr>
@@ -2115,7 +2276,6 @@
           <th class="th_description">Description</th>
           <th class="th_units">Units</th>
           <th class="th_range">Range</th>
-          <th class="th_notes">Notes</th>
           <th class="th_tags">Tags</th>
         </tr>
       </thead>
@@ -2132,7 +2292,8 @@
 
                 
           <tr class="entry" id="static_android.control.aeAvailableAntibandingModes">
-            <td class="entry_name"><html><body><p>android.control.aeAvailableAntibandingModes<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                ><html><body><p>android.control.aeAvailableAntibandingModes<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">byte</span>
                 <span class="entry_type_container">x</span>
@@ -2157,17 +2318,17 @@
             <td class="entry_range">
             </td>
 
-            <td class="entry_notes">
-            </td>
-
             <td class="entry_tags">
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.control.aeAvailableModes">
-            <td class="entry_name"><html><body><p>android.control.aeAvailableModes<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                ><html><body><p>android.control.aeAvailableModes<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">byte</span>
                 <span class="entry_type_container">x</span>
@@ -2195,17 +2356,17 @@
           unit is available<wbr></wbr></p></body></html>
             </td>
 
-            <td class="entry_notes">
-            </td>
-
             <td class="entry_tags">
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.control.aeAvailableTargetFpsRanges">
-            <td class="entry_name"><html><body><p>android.control.aeAvailableTargetFpsRanges<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                ><html><body><p>android.control.aeAvailableTargetFpsRanges<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
                 <span class="entry_type_container">x</span>
@@ -2230,17 +2391,17 @@
             <td class="entry_range">
             </td>
 
-            <td class="entry_notes">
-            </td>
-
             <td class="entry_tags">
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.control.aeCompensationRange">
-            <td class="entry_name"><html><body><p>android.control.aeCompensationRange<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                ><html><body><p>android.control.aeCompensationRange<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
                 <span class="entry_type_container">x</span>
@@ -2267,20 +2428,20 @@
           size)<wbr></wbr></p></body></html>
             </td>
 
-            <td class="entry_notes">
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.control.aeCompensationStep">
-            <td class="entry_name"><html><body><p>android.control.aeCompensationStep<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                ><html><body><p>android.control.aeCompensationStep<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">rational</span>
 
@@ -2301,20 +2462,20 @@
               
             </td>
 
-            <td class="entry_notes">
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.control.afAvailableModes">
-            <td class="entry_name"><html><body><p>android.control.afAvailableModes<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                ><html><body><p>android.control.afAvailableModes<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">byte</span>
                 <span class="entry_type_container">x</span>
@@ -2341,20 +2502,20 @@
           lens allows for changing focus<wbr></wbr></p></body></html>
             </td>
 
-            <td class="entry_notes">
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.control.availableEffects">
-            <td class="entry_name"><html><body><p>android.control.availableEffects<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                ><html><body><p>android.control.availableEffects<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">byte</span>
                 <span class="entry_type_container">x</span>
@@ -2380,20 +2541,20 @@
               <html><body><p>OFF must be listed<wbr></wbr></p></body></html>
             </td>
 
-            <td class="entry_notes">
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.control.availableSceneModes">
-            <td class="entry_name"><html><body><p>android.control.availableSceneModes<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                ><html><body><p>android.control.availableSceneModes<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">byte</span>
                 <span class="entry_type_container">x</span>
@@ -2420,20 +2581,20 @@
           detection is supported<wbr></wbr></p></body></html>
             </td>
 
-            <td class="entry_notes">
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.control.availableVideoStabilizationModes">
-            <td class="entry_name"><html><body><p>android.control.availableVideoStabilizationModes<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                ><html><body><p>android.control.availableVideoStabilizationModes<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">byte</span>
                 <span class="entry_type_container">x</span>
@@ -2459,20 +2620,20 @@
               <html><body><p>OFF must be included<wbr></wbr></p></body></html>
             </td>
 
-            <td class="entry_notes">
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.control.awbAvailableModes">
-            <td class="entry_name"><html><body><p>android.control.awbAvailableModes<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                ><html><body><p>android.control.awbAvailableModes<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">byte</span>
                 <span class="entry_type_container">x</span>
@@ -2496,20 +2657,20 @@
               <html><body><p>OFF, AUTO must be included<wbr></wbr></p></body></html>
             </td>
 
-            <td class="entry_notes">
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.control.maxRegions">
-            <td class="entry_name"><html><body><p>android.control.maxRegions<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                ><html><body><p>android.control.maxRegions<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
 
@@ -2530,20 +2691,21 @@
               <html><body><p>&gt;= 1<wbr></wbr></p></body></html>
             </td>
 
-            <td class="entry_notes">
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.control.sceneModeOverrides">
-            <td class="entry_name"><html><body><p>android.control.sceneModeOverrides<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.control.sceneModeOverrides<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">byte</span>
                 <span class="entry_type_container">x</span>
@@ -2573,7 +2735,18 @@
           order of increasing index<wbr></wbr></p></body></html>
             </td>
 
-            <td class="entry_notes">
+            <td class="entry_tags">
+              <ul class="entry_tags">
+                  <li><a href="#tag_BC">BC</a></li>
+              </ul>
+            </td>
+
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
               <html><body><p>When a scene mode is enabled, the HAL is expected
 to override aeMode, awbMode, and afMode with its
 preferred settings for that scene mode.</p>
@@ -2592,20 +2765,15 @@
 ON_AUTO_FLASH, AUTO, CONTINUOUS_PICTURE, ON_AUTO_FLASH,
 INCANDESCENT, AUTO }<wbr></wbr></p></body></html>
             </td>
-
-            <td class="entry_tags">
-              <ul class="entry_tags">
-                  <li><a href="#tag_BC">BC</a></li>
-              </ul>
-            </td>
-
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
         
 
       <!-- end of kind -->
       </tbody>
-      <tr><td colspan="7" class="kind">dynamic</td></tr>
+      <tr><td colspan="6" class="kind">dynamic</td></tr>
 
       <thead class="entries_header">
         <tr>
@@ -2614,7 +2782,6 @@
           <th class="th_description">Description</th>
           <th class="th_units">Units</th>
           <th class="th_range">Range</th>
-          <th class="th_notes">Notes</th>
           <th class="th_tags">Tags</th>
         </tr>
       </thead>
@@ -2631,7 +2798,9 @@
 
                 
           <tr class="entry" id="dynamic_android.control.aePrecaptureId">
-            <td class="entry_name"><html><body><p>android.control.aePrecaptureId<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.control.aePrecaptureId<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
 
@@ -2651,21 +2820,29 @@
             <td class="entry_range">
             </td>
 
-            <td class="entry_notes">
+            <td class="entry_tags">
+            </td>
+
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
               <html><body><p>Must be 0 if no
 CAMERA2_TRIGGER_PRECAPTURE_METERING trigger received yet
 by HAL. Always updated even if AE algorithm ignores the
 trigger<wbr></wbr></p></body></html>
             </td>
-
-            <td class="entry_tags">
-            </td>
-
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="dynamic_android.control.aeRegions">
-            <td class="entry_name"><html><body><p>android.control.aeRegions<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.control.aeRegions<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
                 <span class="entry_type_container">x</span>
@@ -2689,7 +2866,18 @@
             <td class="entry_range">
             </td>
 
-            <td class="entry_notes">
+            <td class="entry_tags">
+              <ul class="entry_tags">
+                  <li><a href="#tag_BC">BC</a></li>
+              </ul>
+            </td>
+
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
               <html><body><p>Each area is a rectangle plus weight: xmin, ymin,
 xmax, ymax, weight. The rectangle is defined inclusive of the
 specified coordinates.</p>
@@ -2705,18 +2893,15 @@
 should ignore the sections outside the region and output the
 used sections in the frame metadata<wbr></wbr></p></body></html>
             </td>
-
-            <td class="entry_tags">
-              <ul class="entry_tags">
-                  <li><a href="#tag_BC">BC</a></li>
-              </ul>
-            </td>
-
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="dynamic_android.control.aeState">
-            <td class="entry_name"><html><body><p>android.control.aeState<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.control.aeState<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -2772,20 +2957,28 @@
             <td class="entry_range">
             </td>
 
-            <td class="entry_notes">
+            <td class="entry_tags">
+            </td>
+
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
               <html><body><p>Whenever the AE algorithm state changes, a
 MSG_AUTOEXPOSURE notification must be send if a
 notification callback is registered.<wbr></wbr></p></body></html>
             </td>
-
-            <td class="entry_tags">
-            </td>
-
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="dynamic_android.control.afMode">
-            <td class="entry_name"><html><body><p>android.control.afMode<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.control.afMode<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -2886,24 +3079,32 @@
             <td class="entry_range">
             </td>
 
-            <td class="entry_notes">
-              <html><body><p>Only effective if android.control.mode = AUTO.</p>
-<p>If lens is controlled by HAL auto-focus algorithm, the HAL should
-report the current AF status in android.control.afState in
-result metadata.<wbr></wbr></p></body></html>
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
+              <html><body><p>Only effective if android.control.mode = AUTO.</p>
+<p>If lens is controlled by HAL auto-focus algorithm, the HAL should
+report the current AF status in android.control.afState in
+result metadata.<wbr></wbr></p></body></html>
+            </td>
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="dynamic_android.control.afRegions">
-            <td class="entry_name"><html><body><p>android.control.afRegions<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.control.afRegions<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
                 <span class="entry_type_container">x</span>
@@ -2927,7 +3128,18 @@
             <td class="entry_range">
             </td>
 
-            <td class="entry_notes">
+            <td class="entry_tags">
+              <ul class="entry_tags">
+                  <li><a href="#tag_BC">BC</a></li>
+              </ul>
+            </td>
+
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
               <html><body><p>Each area is a rectangle plus weight: xmin, ymin,
 xmax, ymax, weight. The rectangle is defined inclusive of the
 specified coordinates.</p>
@@ -2943,18 +3155,15 @@
 should ignore the sections outside the region and output the
 used sections in the frame metadata<wbr></wbr></p></body></html>
             </td>
-
-            <td class="entry_tags">
-              <ul class="entry_tags">
-                  <li><a href="#tag_BC">BC</a></li>
-              </ul>
-            </td>
-
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="dynamic_android.control.afState">
-            <td class="entry_name"><html><body><p>android.control.afState<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.control.afState<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -3017,20 +3226,28 @@
             <td class="entry_range">
             </td>
 
-            <td class="entry_notes">
+            <td class="entry_tags">
+            </td>
+
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
               <html><body><p>Whenever the AF algorithm state changes, a
 MSG_AUTOFOCUS notification must be send if a notification
 callback is registered.<wbr></wbr></p></body></html>
             </td>
-
-            <td class="entry_tags">
-            </td>
-
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="dynamic_android.control.afTriggerId">
-            <td class="entry_name"><html><body><p>android.control.afTriggerId<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.control.afTriggerId<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
 
@@ -3050,20 +3267,28 @@
             <td class="entry_range">
             </td>
 
-            <td class="entry_notes">
+            <td class="entry_tags">
+            </td>
+
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
               <html><body><p>Must be 0 if no CAMERA2_TRIGGER_AUTOFOCUS trigger
 received yet by HAL. Always updated even if AF algorithm
 ignores the trigger<wbr></wbr></p></body></html>
             </td>
-
-            <td class="entry_tags">
-            </td>
-
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="dynamic_android.control.awbMode">
-            <td class="entry_name"><html><body><p>android.control.awbMode<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.control.awbMode<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -3113,11 +3338,6 @@
             <td class="entry_range">
             </td>
 
-            <td class="entry_notes">
-              <html><body><p>[BC - AWB lock,AWB modes]</p>
-<p>Only effective if android.control.mode = AUTO.<wbr></wbr></p></body></html>
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_BC">BC</a></li>
@@ -3125,11 +3345,24 @@
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
+              <html><body><p>[BC - AWB lock,AWB modes]</p>
+<p>Only effective if android.control.mode = AUTO.<wbr></wbr></p></body></html>
+            </td>
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="dynamic_android.control.awbRegions">
-            <td class="entry_name"><html><body><p>android.control.awbRegions<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.control.awbRegions<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
                 <span class="entry_type_container">x</span>
@@ -3153,7 +3386,18 @@
             <td class="entry_range">
             </td>
 
-            <td class="entry_notes">
+            <td class="entry_tags">
+              <ul class="entry_tags">
+                  <li><a href="#tag_BC">BC</a></li>
+              </ul>
+            </td>
+
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
               <html><body><p>Only used in AUTO mode.</p>
 <p>Each area is a rectangle plus weight: xmin, ymin,
 xmax, ymax, weight. The rectangle is defined inclusive of the
@@ -3170,18 +3414,15 @@
 should ignore the sections outside the region and output the
 used sections in the frame metadata<wbr></wbr></p></body></html>
             </td>
-
-            <td class="entry_tags">
-              <ul class="entry_tags">
-                  <li><a href="#tag_BC">BC</a></li>
-              </ul>
-            </td>
-
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="dynamic_android.control.awbState">
-            <td class="entry_name"><html><body><p>android.control.awbState<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.control.awbState<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -3222,20 +3463,28 @@
             <td class="entry_range">
             </td>
 
-            <td class="entry_notes">
+            <td class="entry_tags">
+            </td>
+
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
               <html><body><p>Whenever the AWB algorithm state changes, a
 MSG_AUTOWHITEBALANCE notification must be send if a
 notification callback is registered.<wbr></wbr></p></body></html>
             </td>
-
-            <td class="entry_tags">
-            </td>
-
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="dynamic_android.control.mode">
-            <td class="entry_name"><html><body><p>android.control.mode<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.control.mode<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -3281,7 +3530,18 @@
               <html><body><p>all must be supported<wbr></wbr></p></body></html>
             </td>
 
-            <td class="entry_notes">
+            <td class="entry_tags">
+              <ul class="entry_tags">
+                  <li><a href="#tag_BC">BC</a></li>
+              </ul>
+            </td>
+
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
               <html><body><p>High-level 3A control. When set to OFF, all 3A control
 by the HAL is disabled. The application must set the fields for
 capture parameters itself.</p>
@@ -3293,14 +3553,9 @@
 as it wishes. The HAL scene mode 3A settings are provided by
 android.control.sceneModeOverrides.<wbr></wbr></p></body></html>
             </td>
-
-            <td class="entry_tags">
-              <ul class="entry_tags">
-                  <li><a href="#tag_BC">BC</a></li>
-              </ul>
-            </td>
-
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
         
 
@@ -3308,10 +3563,10 @@
       </tbody>
 
   <!-- end of section -->
-  <tr><td colspan="7" id="section_demosaic" class="section">demosaic</td></tr>
+  <tr><td colspan="6" id="section_demosaic" class="section">demosaic</td></tr>
 
 
-      <tr><td colspan="7" class="kind">controls</td></tr>
+      <tr><td colspan="6" class="kind">controls</td></tr>
 
       <thead class="entries_header">
         <tr>
@@ -3320,7 +3575,6 @@
           <th class="th_description">Description</th>
           <th class="th_units">Units</th>
           <th class="th_range">Range</th>
-          <th class="th_notes">Notes</th>
           <th class="th_tags">Tags</th>
         </tr>
       </thead>
@@ -3337,7 +3591,8 @@
 
                 
           <tr class="entry" id="controls_android.demosaic.mode">
-            <td class="entry_name"><html><body><p>android.demosaic.mode<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                ><html><body><p>android.demosaic.mode<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -3369,16 +3624,15 @@
             <td class="entry_range">
             </td>
 
-            <td class="entry_notes">
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_V1">V1</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
         
 
@@ -3386,10 +3640,10 @@
       </tbody>
 
   <!-- end of section -->
-  <tr><td colspan="7" id="section_edge" class="section">edge</td></tr>
+  <tr><td colspan="6" id="section_edge" class="section">edge</td></tr>
 
 
-      <tr><td colspan="7" class="kind">controls</td></tr>
+      <tr><td colspan="6" class="kind">controls</td></tr>
 
       <thead class="entries_header">
         <tr>
@@ -3398,7 +3652,6 @@
           <th class="th_description">Description</th>
           <th class="th_units">Units</th>
           <th class="th_range">Range</th>
-          <th class="th_notes">Notes</th>
           <th class="th_tags">Tags</th>
         </tr>
       </thead>
@@ -3415,7 +3668,9 @@
 
                 
           <tr class="entry" id="controls_android.edge.mode">
-            <td class="entry_name"><html><body><p>android.edge.mode<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.edge.mode<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -3451,7 +3706,15 @@
             <td class="entry_range">
             </td>
 
-            <td class="entry_notes">
+            <td class="entry_tags">
+            </td>
+
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
               <html><body><p>Edge/sharpness/detail enhancement. OFF means no
 enhancement will be applied by the HAL.</p>
 <p>FAST/HIGH_QUALITY both mean HAL-determined enhancement
@@ -3460,15 +3723,14 @@
 even if it slows down capture rate. FAST means the HAL should
 not slow down capture rate when applying edge enhancement.<wbr></wbr></p></body></html>
             </td>
-
-            <td class="entry_tags">
-            </td>
-
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="controls_android.edge.strength">
-            <td class="entry_name"><html><body><p>android.edge.strength<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                ><html><body><p>android.edge.strength<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">byte</span>
 
@@ -3489,19 +3751,18 @@
             <td class="entry_range">
             </td>
 
-            <td class="entry_notes">
-            </td>
-
             <td class="entry_tags">
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
         
 
       <!-- end of kind -->
       </tbody>
-      <tr><td colspan="7" class="kind">dynamic</td></tr>
+      <tr><td colspan="6" class="kind">dynamic</td></tr>
 
       <thead class="entries_header">
         <tr>
@@ -3510,7 +3771,6 @@
           <th class="th_description">Description</th>
           <th class="th_units">Units</th>
           <th class="th_range">Range</th>
-          <th class="th_notes">Notes</th>
           <th class="th_tags">Tags</th>
         </tr>
       </thead>
@@ -3527,7 +3787,9 @@
 
                 
           <tr class="entry" id="dynamic_android.edge.mode">
-            <td class="entry_name"><html><body><p>android.edge.mode<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.edge.mode<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -3563,7 +3825,15 @@
             <td class="entry_range">
             </td>
 
-            <td class="entry_notes">
+            <td class="entry_tags">
+            </td>
+
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
               <html><body><p>Edge/sharpness/detail enhancement. OFF means no
 enhancement will be applied by the HAL.</p>
 <p>FAST/HIGH_QUALITY both mean HAL-determined enhancement
@@ -3572,11 +3842,9 @@
 even if it slows down capture rate. FAST means the HAL should
 not slow down capture rate when applying edge enhancement.<wbr></wbr></p></body></html>
             </td>
-
-            <td class="entry_tags">
-            </td>
-
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
         
 
@@ -3584,10 +3852,10 @@
       </tbody>
 
   <!-- end of section -->
-  <tr><td colspan="7" id="section_flash" class="section">flash</td></tr>
+  <tr><td colspan="6" id="section_flash" class="section">flash</td></tr>
 
 
-      <tr><td colspan="7" class="kind">controls</td></tr>
+      <tr><td colspan="6" class="kind">controls</td></tr>
 
       <thead class="entries_header">
         <tr>
@@ -3596,7 +3864,6 @@
           <th class="th_description">Description</th>
           <th class="th_units">Units</th>
           <th class="th_range">Range</th>
-          <th class="th_notes">Notes</th>
           <th class="th_tags">Tags</th>
         </tr>
       </thead>
@@ -3613,7 +3880,9 @@
 
                 
           <tr class="entry" id="controls_android.flash.firingPower">
-            <td class="entry_name"><html><body><p>android.flash.firingPower<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.flash.firingPower<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">byte</span>
 
@@ -3634,23 +3903,31 @@
               <html><body><p>0 - 10<wbr></wbr></p></body></html>
             </td>
 
-            <td class="entry_notes">
-              <html><body><p>Power for snapshot may use a different scale than
-for torch mode. Only one entry for torch mode will be
-used<wbr></wbr></p></body></html>
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_V1">V1</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
+              <html><body><p>Power for snapshot may use a different scale than
+for torch mode. Only one entry for torch mode will be
+used<wbr></wbr></p></body></html>
+            </td>
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="controls_android.flash.firingTime">
-            <td class="entry_name"><html><body><p>android.flash.firingTime<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.flash.firingTime<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">int64</span>
 
@@ -3672,22 +3949,29 @@
               <html><body><p>0-(exposure time-flash duration)<wbr></wbr></p></body></html>
             </td>
 
-            <td class="entry_notes">
-              <html><body><p>Clamped to (0, exposure time - flash
-duration).<wbr></wbr></p></body></html>
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_V1">V1</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
+              <html><body><p>Clamped to (0, exposure time - flash
+duration).<wbr></wbr></p></body></html>
+            </td>
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="controls_android.flash.mode">
-            <td class="entry_name"><html><body><p>android.flash.mode<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                ><html><body><p>android.flash.mode<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -3725,22 +4009,21 @@
             <td class="entry_range">
             </td>
 
-            <td class="entry_notes">
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
         
 
       <!-- end of kind -->
       </tbody>
-      <tr><td colspan="7" class="kind">static</td></tr>
+      <tr><td colspan="6" class="kind">static</td></tr>
 
       <thead class="entries_header">
         <tr>
@@ -3749,7 +4032,6 @@
           <th class="th_description">Description</th>
           <th class="th_units">Units</th>
           <th class="th_range">Range</th>
-          <th class="th_notes">Notes</th>
           <th class="th_tags">Tags</th>
         </tr>
       </thead>
@@ -3768,7 +4050,9 @@
 
                 
           <tr class="entry" id="static_android.flash.info.available">
-            <td class="entry_name"><html><body><p>android.flash.info.available<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.flash.info.available<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">byte</span>
 
@@ -3789,22 +4073,30 @@
             <td class="entry_range">
             </td>
 
-            <td class="entry_notes">
-              <html><body><p>If no flash, none of the flash controls do
-anything. All other metadata should return 0<wbr></wbr></p></body></html>
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
+              <html><body><p>If no flash, none of the flash controls do
+anything. All other metadata should return 0<wbr></wbr></p></body></html>
+            </td>
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.flash.info.chargeDuration">
-            <td class="entry_name"><html><body><p>android.flash.info.chargeDuration<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.flash.info.chargeDuration<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">int64</span>
 
@@ -3826,25 +4118,32 @@
               <html><body><p>0-1e9<wbr></wbr></p></body></html>
             </td>
 
-            <td class="entry_notes">
-              <html><body><p>1 second too long/too short for recharge? Should
-this be power-dependent?<wbr></wbr></p></body></html>
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_V1">V1</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
+              <html><body><p>1 second too long/too short for recharge? Should
+this be power-dependent?<wbr></wbr></p></body></html>
+            </td>
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
         
         
 
                 
           <tr class="entry" id="static_android.flash.colorTemperature">
-            <td class="entry_name"><html><body><p>android.flash.colorTemperature<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                ><html><body><p>android.flash.colorTemperature<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">byte</span>
 
@@ -3866,20 +4165,20 @@
               <html><body><p>0-1 for both<wbr></wbr></p></body></html>
             </td>
 
-            <td class="entry_notes">
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_ADV">ADV</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.flash.maxEnergy">
-            <td class="entry_name"><html><body><p>android.flash.maxEnergy<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                ><html><body><p>android.flash.maxEnergy<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">byte</span>
 
@@ -3901,22 +4200,21 @@
               <html><body><p>&gt;= 0<wbr></wbr></p></body></html>
             </td>
 
-            <td class="entry_notes">
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_ADV">ADV</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
         
 
       <!-- end of kind -->
       </tbody>
-      <tr><td colspan="7" class="kind">dynamic</td></tr>
+      <tr><td colspan="6" class="kind">dynamic</td></tr>
 
       <thead class="entries_header">
         <tr>
@@ -3925,7 +4223,6 @@
           <th class="th_description">Description</th>
           <th class="th_units">Units</th>
           <th class="th_range">Range</th>
-          <th class="th_notes">Notes</th>
           <th class="th_tags">Tags</th>
         </tr>
       </thead>
@@ -3942,7 +4239,9 @@
 
                 
           <tr class="entry" id="dynamic_android.flash.firingPower">
-            <td class="entry_name"><html><body><p>android.flash.firingPower<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.flash.firingPower<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">byte</span>
 
@@ -3963,23 +4262,31 @@
               <html><body><p>0 - 10<wbr></wbr></p></body></html>
             </td>
 
-            <td class="entry_notes">
-              <html><body><p>Power for snapshot may use a different scale than
-for torch mode. Only one entry for torch mode will be
-used<wbr></wbr></p></body></html>
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_V1">V1</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
+              <html><body><p>Power for snapshot may use a different scale than
+for torch mode. Only one entry for torch mode will be
+used<wbr></wbr></p></body></html>
+            </td>
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="dynamic_android.flash.firingTime">
-            <td class="entry_name"><html><body><p>android.flash.firingTime<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.flash.firingTime<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">int64</span>
 
@@ -4001,22 +4308,29 @@
               <html><body><p>0-(exposure time-flash duration)<wbr></wbr></p></body></html>
             </td>
 
-            <td class="entry_notes">
-              <html><body><p>Clamped to (0, exposure time - flash
-duration).<wbr></wbr></p></body></html>
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_V1">V1</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
+              <html><body><p>Clamped to (0, exposure time - flash
+duration).<wbr></wbr></p></body></html>
+            </td>
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="dynamic_android.flash.mode">
-            <td class="entry_name"><html><body><p>android.flash.mode<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                ><html><body><p>android.flash.mode<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -4054,20 +4368,20 @@
             <td class="entry_range">
             </td>
 
-            <td class="entry_notes">
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="dynamic_android.flash.state">
-            <td class="entry_name"><html><body><p>android.flash.state<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                ><html><body><p>android.flash.state<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -4108,13 +4422,12 @@
             <td class="entry_range">
             </td>
 
-            <td class="entry_notes">
-            </td>
-
             <td class="entry_tags">
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
         
 
@@ -4122,10 +4435,10 @@
       </tbody>
 
   <!-- end of section -->
-  <tr><td colspan="7" id="section_geometric" class="section">geometric</td></tr>
+  <tr><td colspan="6" id="section_geometric" class="section">geometric</td></tr>
 
 
-      <tr><td colspan="7" class="kind">controls</td></tr>
+      <tr><td colspan="6" class="kind">controls</td></tr>
 
       <thead class="entries_header">
         <tr>
@@ -4134,7 +4447,6 @@
           <th class="th_description">Description</th>
           <th class="th_units">Units</th>
           <th class="th_range">Range</th>
-          <th class="th_notes">Notes</th>
           <th class="th_tags">Tags</th>
         </tr>
       </thead>
@@ -4151,7 +4463,8 @@
 
                 
           <tr class="entry" id="controls_android.geometric.mode">
-            <td class="entry_name"><html><body><p>android.geometric.mode<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                ><html><body><p>android.geometric.mode<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -4188,17 +4501,17 @@
             <td class="entry_range">
             </td>
 
-            <td class="entry_notes">
-            </td>
-
             <td class="entry_tags">
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="controls_android.geometric.strength">
-            <td class="entry_name"><html><body><p>android.geometric.strength<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                ><html><body><p>android.geometric.strength<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">byte</span>
 
@@ -4220,16 +4533,15 @@
             <td class="entry_range">
             </td>
 
-            <td class="entry_notes">
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_ADV">ADV</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
         
 
@@ -4237,10 +4549,10 @@
       </tbody>
 
   <!-- end of section -->
-  <tr><td colspan="7" id="section_hotPixel" class="section">hotPixel</td></tr>
+  <tr><td colspan="6" id="section_hotPixel" class="section">hotPixel</td></tr>
 
 
-      <tr><td colspan="7" class="kind">controls</td></tr>
+      <tr><td colspan="6" class="kind">controls</td></tr>
 
       <thead class="entries_header">
         <tr>
@@ -4249,7 +4561,6 @@
           <th class="th_description">Description</th>
           <th class="th_units">Units</th>
           <th class="th_range">Range</th>
-          <th class="th_notes">Notes</th>
           <th class="th_tags">Tags</th>
         </tr>
       </thead>
@@ -4266,7 +4577,8 @@
 
                 
           <tr class="entry" id="controls_android.hotPixel.mode">
-            <td class="entry_name"><html><body><p>android.hotPixel.mode<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                ><html><body><p>android.hotPixel.mode<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -4303,22 +4615,21 @@
             <td class="entry_range">
             </td>
 
-            <td class="entry_notes">
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_V1">V1</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
         
 
       <!-- end of kind -->
       </tbody>
-      <tr><td colspan="7" class="kind">static</td></tr>
+      <tr><td colspan="6" class="kind">static</td></tr>
 
       <thead class="entries_header">
         <tr>
@@ -4327,7 +4638,6 @@
           <th class="th_description">Description</th>
           <th class="th_units">Units</th>
           <th class="th_range">Range</th>
-          <th class="th_notes">Notes</th>
           <th class="th_tags">Tags</th>
         </tr>
       </thead>
@@ -4346,7 +4656,8 @@
 
                 
           <tr class="entry" id="static_android.hotPixel.info.map">
-            <td class="entry_name"><html><body><p>android.hotPixel.info.map<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                ><html><body><p>android.hotPixel.info.map<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
                 <span class="entry_type_container">x</span>
@@ -4371,16 +4682,15 @@
             <td class="entry_range">
             </td>
 
-            <td class="entry_notes">
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_ADV">ADV</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
         
         
@@ -4389,7 +4699,7 @@
 
       <!-- end of kind -->
       </tbody>
-      <tr><td colspan="7" class="kind">dynamic</td></tr>
+      <tr><td colspan="6" class="kind">dynamic</td></tr>
 
       <thead class="entries_header">
         <tr>
@@ -4398,7 +4708,6 @@
           <th class="th_description">Description</th>
           <th class="th_units">Units</th>
           <th class="th_range">Range</th>
-          <th class="th_notes">Notes</th>
           <th class="th_tags">Tags</th>
         </tr>
       </thead>
@@ -4415,7 +4724,8 @@
 
                 
           <tr class="entry" id="dynamic_android.hotPixel.mode">
-            <td class="entry_name"><html><body><p>android.hotPixel.mode<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                ><html><body><p>android.hotPixel.mode<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -4452,16 +4762,15 @@
             <td class="entry_range">
             </td>
 
-            <td class="entry_notes">
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_V1">V1</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
         
 
@@ -4469,10 +4778,10 @@
       </tbody>
 
   <!-- end of section -->
-  <tr><td colspan="7" id="section_jpeg" class="section">jpeg</td></tr>
+  <tr><td colspan="6" id="section_jpeg" class="section">jpeg</td></tr>
 
 
-      <tr><td colspan="7" class="kind">controls</td></tr>
+      <tr><td colspan="6" class="kind">controls</td></tr>
 
       <thead class="entries_header">
         <tr>
@@ -4481,7 +4790,6 @@
           <th class="th_description">Description</th>
           <th class="th_units">Units</th>
           <th class="th_range">Range</th>
-          <th class="th_notes">Notes</th>
           <th class="th_tags">Tags</th>
         </tr>
       </thead>
@@ -4498,7 +4806,8 @@
 
                 
           <tr class="entry" id="controls_android.jpeg.gpsCoordinates">
-            <td class="entry_name"><html><body><p>android.jpeg.gpsCoordinates<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                ><html><body><p>android.jpeg.gpsCoordinates<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">double</span>
                 <span class="entry_type_container">x</span>
@@ -4524,20 +4833,20 @@
               <html><body><p>(-180 - 180], [-90,90], [-inf, inf]<wbr></wbr></p></body></html>
             </td>
 
-            <td class="entry_notes">
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="controls_android.jpeg.gpsProcessingMethod">
-            <td class="entry_name"><html><body><p>android.jpeg.gpsProcessingMethod<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                ><html><body><p>android.jpeg.gpsProcessingMethod<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">byte</span>
 
@@ -4558,20 +4867,20 @@
             <td class="entry_range">
             </td>
 
-            <td class="entry_notes">
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="controls_android.jpeg.gpsTimestamp">
-            <td class="entry_name"><html><body><p>android.jpeg.gpsTimestamp<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                ><html><body><p>android.jpeg.gpsTimestamp<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">int64</span>
 
@@ -4592,20 +4901,20 @@
             <td class="entry_range">
             </td>
 
-            <td class="entry_notes">
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="controls_android.jpeg.orientation">
-            <td class="entry_name"><html><body><p>android.jpeg.orientation<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                ><html><body><p>android.jpeg.orientation<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
 
@@ -4627,20 +4936,21 @@
               <html><body><p>0, 90, 180, 270<wbr></wbr></p></body></html>
             </td>
 
-            <td class="entry_notes">
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="controls_android.jpeg.quality">
-            <td class="entry_name"><html><body><p>android.jpeg.quality<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.jpeg.quality<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">byte</span>
 
@@ -4661,21 +4971,28 @@
               <html><body><p>1-100; larger is higher quality<wbr></wbr></p></body></html>
             </td>
 
-            <td class="entry_notes">
-              <html><body><p>85-95 is typical usage range<wbr></wbr></p></body></html>
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
+              <html><body><p>85-95 is typical usage range<wbr></wbr></p></body></html>
+            </td>
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="controls_android.jpeg.thumbnailQuality">
-            <td class="entry_name"><html><body><p>android.jpeg.thumbnailQuality<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                ><html><body><p>android.jpeg.thumbnailQuality<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">byte</span>
 
@@ -4696,20 +5013,20 @@
               <html><body><p>1-100; larger is higher quality<wbr></wbr></p></body></html>
             </td>
 
-            <td class="entry_notes">
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="controls_android.jpeg.thumbnailSize">
-            <td class="entry_name"><html><body><p>android.jpeg.thumbnailSize<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                ><html><body><p>android.jpeg.thumbnailSize<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
                 <span class="entry_type_container">x</span>
@@ -4723,21 +5040,15 @@
             </td> <!-- entry_type -->
 
             <td class="entry_description">
-              <html><body><p>Resolution of embedded JPEG thumbnail<wbr></wbr></p></body></html>
+              <html><body><p>Resolution of embedded JPEG
+thumbnail<wbr></wbr></p></body></html>
             </td>
 
             <td class="entry_units">
             </td>
 
             <td class="entry_range">
-              <html><body><p>Size must be one of the size from android.jpeg.availableThumbnailSizes<wbr></wbr></p></body></html>
-            </td>
-
-            <td class="entry_notes">
-              <html><body><p>When set to (0, 0) value, the JPEG EXIF must not contain thumbnail,
-but the captured JPEG must still be a valid image.</p>
-<p>When a jpeg image capture is issued, the thumbnail size selected should have
-the same aspect ratio as the jpeg image.<wbr></wbr></p></body></html>
+              <html><body><p>from android.jpeg.availableThumbnailSizes<wbr></wbr></p></body></html>
             </td>
 
             <td class="entry_tags">
@@ -4746,13 +5057,15 @@
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
         
 
       <!-- end of kind -->
       </tbody>
-      <tr><td colspan="7" class="kind">static</td></tr>
+      <tr><td colspan="6" class="kind">static</td></tr>
 
       <thead class="entries_header">
         <tr>
@@ -4761,7 +5074,6 @@
           <th class="th_description">Description</th>
           <th class="th_units">Units</th>
           <th class="th_range">Range</th>
-          <th class="th_notes">Notes</th>
           <th class="th_tags">Tags</th>
         </tr>
       </thead>
@@ -4778,7 +5090,8 @@
 
                 
           <tr class="entry" id="static_android.jpeg.availableThumbnailSizes">
-            <td class="entry_name"><html><body><p>android.jpeg.availableThumbnailSizes<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                ><html><body><p>android.jpeg.availableThumbnailSizes<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
                 <span class="entry_type_container">x</span>
@@ -4787,12 +5100,14 @@
                   2 x n
                 </span>
               <span class="entry_type_visibility"> [public as size]</span>
+                <div class="entry_type_notes"><html><body><p>list of resolution pairs<wbr></wbr></p></body></html></div>
 
 
             </td> <!-- entry_type -->
 
             <td class="entry_description">
-              <html><body><p>Supported resolutions for the JPEG thumbnail<wbr></wbr></p></body></html>
+              <html><body><p>Supported resolutions for the JPEG
+thumbnail<wbr></wbr></p></body></html>
             </td>
 
             <td class="entry_units">
@@ -4800,23 +5115,7 @@
 
             <td class="entry_range">
               <html><body><p>Must include at least one valid resolution, plus
-          (0,0) for no thumbnail generation, and each size must be distinct.<wbr></wbr></p></body></html>
-            </td>
-
-            <td class="entry_notes">
-              <html><body><p>Below condiditions must be satisfied for this size list:</p>
-<ul>
-<li>The sizes must be sorted by increasing pixel area (width x height).
-If several resolutions have the same area, they must be sorted by increasing width.</li>
-<li>The aspect ratio of the largest thumbnail size must be same as the
-aspect ratio of largest size in android.scaler.availableJpegSizes.
-The largest size is defined as the size that has the largest pixel area
-in a given size list.</li>
-<li>Each size in android.scaler.availableJpegSizes must have at least
-one corresponding size that has the same aspect ratio in availableThumbnailSizes,
-and vice versa.</li>
-<li>All non (0, 0) sizes must have non-zero widths and heights.</li>
-<wbr></wbr></ul></body></html>
+          (0,0) for no thumbnail generation<wbr></wbr></p></body></html>
             </td>
 
             <td class="entry_tags">
@@ -4825,11 +5124,15 @@
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.jpeg.maxSize">
-            <td class="entry_name"><html><body><p>android.jpeg.maxSize<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.jpeg.maxSize<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
 
@@ -4851,21 +5154,27 @@
           the camera<wbr></wbr></p></body></html>
             </td>
 
-            <td class="entry_notes">
-              <html><body><p>This is used for sizing the gralloc buffers for
-JPEG<wbr></wbr></p></body></html>
-            </td>
-
             <td class="entry_tags">
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
+              <html><body><p>This is used for sizing the gralloc buffers for
+JPEG<wbr></wbr></p></body></html>
+            </td>
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
         
 
       <!-- end of kind -->
       </tbody>
-      <tr><td colspan="7" class="kind">dynamic</td></tr>
+      <tr><td colspan="6" class="kind">dynamic</td></tr>
 
       <thead class="entries_header">
         <tr>
@@ -4874,7 +5183,6 @@
           <th class="th_description">Description</th>
           <th class="th_units">Units</th>
           <th class="th_range">Range</th>
-          <th class="th_notes">Notes</th>
           <th class="th_tags">Tags</th>
         </tr>
       </thead>
@@ -4891,7 +5199,8 @@
 
                 
           <tr class="entry" id="dynamic_android.jpeg.gpsCoordinates">
-            <td class="entry_name"><html><body><p>android.jpeg.gpsCoordinates<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                ><html><body><p>android.jpeg.gpsCoordinates<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">double</span>
                 <span class="entry_type_container">x</span>
@@ -4917,20 +5226,20 @@
               <html><body><p>(-180 - 180], [-90,90], [-inf, inf]<wbr></wbr></p></body></html>
             </td>
 
-            <td class="entry_notes">
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="dynamic_android.jpeg.gpsProcessingMethod">
-            <td class="entry_name"><html><body><p>android.jpeg.gpsProcessingMethod<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                ><html><body><p>android.jpeg.gpsProcessingMethod<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">byte</span>
 
@@ -4951,20 +5260,20 @@
             <td class="entry_range">
             </td>
 
-            <td class="entry_notes">
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="dynamic_android.jpeg.gpsTimestamp">
-            <td class="entry_name"><html><body><p>android.jpeg.gpsTimestamp<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                ><html><body><p>android.jpeg.gpsTimestamp<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">int64</span>
 
@@ -4985,20 +5294,20 @@
             <td class="entry_range">
             </td>
 
-            <td class="entry_notes">
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="dynamic_android.jpeg.orientation">
-            <td class="entry_name"><html><body><p>android.jpeg.orientation<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                ><html><body><p>android.jpeg.orientation<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
 
@@ -5020,20 +5329,21 @@
               <html><body><p>0, 90, 180, 270<wbr></wbr></p></body></html>
             </td>
 
-            <td class="entry_notes">
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="dynamic_android.jpeg.quality">
-            <td class="entry_name"><html><body><p>android.jpeg.quality<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.jpeg.quality<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">byte</span>
 
@@ -5054,21 +5364,29 @@
               <html><body><p>1-100; larger is higher quality<wbr></wbr></p></body></html>
             </td>
 
-            <td class="entry_notes">
-              <html><body><p>85-95 is typical usage range<wbr></wbr></p></body></html>
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
+              <html><body><p>85-95 is typical usage range<wbr></wbr></p></body></html>
+            </td>
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="dynamic_android.jpeg.size">
-            <td class="entry_name"><html><body><p>android.jpeg.size<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.jpeg.size<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
 
@@ -5089,7 +5407,15 @@
               <html><body><p>&gt;= 0<wbr></wbr></p></body></html>
             </td>
 
-            <td class="entry_notes">
+            <td class="entry_tags">
+            </td>
+
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
               <html><body><p>If no JPEG output is produced for the request,
 this must be 0.</p>
 <p>Otherwise, this describes the real size of the compressed
@@ -5099,15 +5425,14 @@
 the JPEG stream will be 1000000 bytes, of which the first
 500000 make up the real data.<wbr></wbr></p></body></html>
             </td>
-
-            <td class="entry_tags">
-            </td>
-
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="dynamic_android.jpeg.thumbnailQuality">
-            <td class="entry_name"><html><body><p>android.jpeg.thumbnailQuality<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                ><html><body><p>android.jpeg.thumbnailQuality<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">byte</span>
 
@@ -5128,20 +5453,20 @@
               <html><body><p>1-100; larger is higher quality<wbr></wbr></p></body></html>
             </td>
 
-            <td class="entry_notes">
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="dynamic_android.jpeg.thumbnailSize">
-            <td class="entry_name"><html><body><p>android.jpeg.thumbnailSize<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                ><html><body><p>android.jpeg.thumbnailSize<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
                 <span class="entry_type_container">x</span>
@@ -5155,21 +5480,15 @@
             </td> <!-- entry_type -->
 
             <td class="entry_description">
-              <html><body><p>Resolution of embedded JPEG thumbnail<wbr></wbr></p></body></html>
+              <html><body><p>Resolution of embedded JPEG
+thumbnail<wbr></wbr></p></body></html>
             </td>
 
             <td class="entry_units">
             </td>
 
             <td class="entry_range">
-              <html><body><p>Size must be one of the size from android.jpeg.availableThumbnailSizes<wbr></wbr></p></body></html>
-            </td>
-
-            <td class="entry_notes">
-              <html><body><p>When set to (0, 0) value, the JPEG EXIF must not contain thumbnail,
-but the captured JPEG must still be a valid image.</p>
-<p>When a jpeg image capture is issued, the thumbnail size selected should have
-the same aspect ratio as the jpeg image.<wbr></wbr></p></body></html>
+              <html><body><p>from android.jpeg.availableThumbnailSizes<wbr></wbr></p></body></html>
             </td>
 
             <td class="entry_tags">
@@ -5178,7 +5497,9 @@
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
         
 
@@ -5186,10 +5507,10 @@
       </tbody>
 
   <!-- end of section -->
-  <tr><td colspan="7" id="section_lens" class="section">lens</td></tr>
+  <tr><td colspan="6" id="section_lens" class="section">lens</td></tr>
 
 
-      <tr><td colspan="7" class="kind">controls</td></tr>
+      <tr><td colspan="6" class="kind">controls</td></tr>
 
       <thead class="entries_header">
         <tr>
@@ -5198,7 +5519,6 @@
           <th class="th_description">Description</th>
           <th class="th_units">Units</th>
           <th class="th_range">Range</th>
-          <th class="th_notes">Notes</th>
           <th class="th_tags">Tags</th>
         </tr>
       </thead>
@@ -5215,7 +5535,9 @@
 
                 
           <tr class="entry" id="controls_android.lens.aperture">
-            <td class="entry_name"><html><body><p>android.lens.aperture<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.lens.aperture<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">float</span>
 
@@ -5236,22 +5558,30 @@
               <html><body><p>android.lens.info.availableApertures<wbr></wbr></p></body></html>
             </td>
 
-            <td class="entry_notes">
-              <html><body><p>Will not be supported on most devices. Can only
-pick from supported list<wbr></wbr></p></body></html>
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_V1">V1</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
+              <html><body><p>Will not be supported on most devices. Can only
+pick from supported list<wbr></wbr></p></body></html>
+            </td>
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="controls_android.lens.filterDensity">
-            <td class="entry_name"><html><body><p>android.lens.filterDensity<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.lens.filterDensity<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">float</span>
 
@@ -5273,22 +5603,30 @@
               <html><body><p>android.lens.info.availableFilterDensities<wbr></wbr></p></body></html>
             </td>
 
-            <td class="entry_notes">
-              <html><body><p>Will not be supported on most devices. Can only
-pick from supported list<wbr></wbr></p></body></html>
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_V1">V1</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
+              <html><body><p>Will not be supported on most devices. Can only
+pick from supported list<wbr></wbr></p></body></html>
+            </td>
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="controls_android.lens.focalLength">
-            <td class="entry_name"><html><body><p>android.lens.focalLength<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.lens.focalLength<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">float</span>
 
@@ -5309,21 +5647,29 @@
               <html><body><p>&gt; 0<wbr></wbr></p></body></html>
             </td>
 
-            <td class="entry_notes">
-              <html><body><p>Will not be supported on most devices.<wbr></wbr></p></body></html>
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_V1">V1</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
+              <html><body><p>Will not be supported on most devices.<wbr></wbr></p></body></html>
+            </td>
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="controls_android.lens.focusDistance">
-            <td class="entry_name"><html><body><p>android.lens.focusDistance<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.lens.focusDistance<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">float</span>
 
@@ -5345,11 +5691,6 @@
               <html><body><p>&gt;= 0<wbr></wbr></p></body></html>
             </td>
 
-            <td class="entry_notes">
-              <html><body><p>0 = infinity focus. Used value should be clamped
-to (0,minimum focus distance)<wbr></wbr></p></body></html>
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_BC">BC</a></li>
@@ -5357,11 +5698,24 @@
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
+              <html><body><p>0 = infinity focus. Used value should be clamped
+to (0,minimum focus distance)<wbr></wbr></p></body></html>
+            </td>
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="controls_android.lens.opticalStabilizationMode">
-            <td class="entry_name"><html><body><p>android.lens.opticalStabilizationMode<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.lens.opticalStabilizationMode<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -5391,23 +5745,29 @@
               <html><body><p>android.lens.availableOpticalStabilization<wbr></wbr></p></body></html>
             </td>
 
-            <td class="entry_notes">
-              <html><body><p>Will not be supported on most devices.<wbr></wbr></p></body></html>
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_V1">V1</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
+              <html><body><p>Will not be supported on most devices.<wbr></wbr></p></body></html>
+            </td>
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
         
 
       <!-- end of kind -->
       </tbody>
-      <tr><td colspan="7" class="kind">static</td></tr>
+      <tr><td colspan="6" class="kind">static</td></tr>
 
       <thead class="entries_header">
         <tr>
@@ -5416,7 +5776,6 @@
           <th class="th_description">Description</th>
           <th class="th_units">Units</th>
           <th class="th_range">Range</th>
-          <th class="th_notes">Notes</th>
           <th class="th_tags">Tags</th>
         </tr>
       </thead>
@@ -5435,7 +5794,9 @@
 
                 
           <tr class="entry" id="static_android.lens.info.availableApertures">
-            <td class="entry_name"><html><body><p>android.lens.info.availableApertures<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.lens.info.availableApertures<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">float</span>
                 <span class="entry_type_container">x</span>
@@ -5460,22 +5821,30 @@
               <html><body><p>one entry required, &gt; 0<wbr></wbr></p></body></html>
             </td>
 
-            <td class="entry_notes">
-              <html><body><p>If variable aperture not available, only setting
-should be for the fixed aperture<wbr></wbr></p></body></html>
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_V1">V1</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
+              <html><body><p>If variable aperture not available, only setting
+should be for the fixed aperture<wbr></wbr></p></body></html>
+            </td>
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.lens.info.availableFilterDensities">
-            <td class="entry_name"><html><body><p>android.lens.info.availableFilterDensities<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.lens.info.availableFilterDensities<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">float</span>
                 <span class="entry_type_container">x</span>
@@ -5500,24 +5869,32 @@
               <html><body><p>one entry required, &gt;= 0<wbr></wbr></p></body></html>
             </td>
 
-            <td class="entry_notes">
-              <html><body><p>If not available, only setting is 0. Otherwise,
-lists the available exposure index values for dimming
-(2 would mean the filter is set to reduce incoming
-light by two stops)<wbr></wbr></p></body></html>
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_V1">V1</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
+              <html><body><p>If not available, only setting is 0. Otherwise,
+lists the available exposure index values for dimming
+(2 would mean the filter is set to reduce incoming
+light by two stops)<wbr></wbr></p></body></html>
+            </td>
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.lens.info.availableFocalLengths">
-            <td class="entry_name"><html><body><p>android.lens.info.availableFocalLengths<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.lens.info.availableFocalLengths<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">float</span>
                 <span class="entry_type_container">x</span>
@@ -5544,11 +5921,6 @@
               <html><body><p>&gt; 0<wbr></wbr></p></body></html>
             </td>
 
-            <td class="entry_notes">
-              <html><body><p>If optical zoom not supported, only one value
-should be reported<wbr></wbr></p></body></html>
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_BC">BC</a></li>
@@ -5556,11 +5928,23 @@
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
+              <html><body><p>If optical zoom not supported, only one value
+should be reported<wbr></wbr></p></body></html>
+            </td>
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.lens.info.availableOpticalStabilization">
-            <td class="entry_name"><html><body><p>android.lens.info.availableOpticalStabilization<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                ><html><body><p>android.lens.info.availableOpticalStabilization<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">byte</span>
                 <span class="entry_type_container">x</span>
@@ -5585,20 +5969,21 @@
             <td class="entry_range">
             </td>
 
-            <td class="entry_notes">
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_V1">V1</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.lens.info.geometricCorrectionMap">
-            <td class="entry_name"><html><body><p>android.lens.info.geometricCorrectionMap<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.lens.info.geometricCorrectionMap<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">float</span>
                 <span class="entry_type_container">x</span>
@@ -5625,25 +6010,32 @@
               <html><body><p>N, M &gt;= 2<wbr></wbr></p></body></html>
             </td>
 
-            <td class="entry_notes">
-              <html><body><p>[DNG wants a function instead]. What's easiest
-for implementers? With an array size (M, N), entry (i,
-j) provides the destination for pixel (i/(M-1) * width,
-j/(N-1) * height). Data is row-major, with each array
-entry being ( (X, Y)_r, (X, Y)_g, (X, Y)_b ) )<wbr></wbr></p></body></html>
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_DNG">DNG</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
+              <html><body><p>[DNG wants a function instead]. What's easiest
+for implementers? With an array size (M, N), entry (i,
+j) provides the destination for pixel (i/(M-1) * width,
+j/(N-1) * height). Data is row-major, with each array
+entry being ( (X, Y)_r, (X, Y)_g, (X, Y)_b ) )<wbr></wbr></p></body></html>
+            </td>
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.lens.info.geometricCorrectionMapSize">
-            <td class="entry_name"><html><body><p>android.lens.info.geometricCorrectionMapSize<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                ><html><body><p>android.lens.info.geometricCorrectionMapSize<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
                 <span class="entry_type_container">x</span>
@@ -5669,20 +6061,21 @@
               <html><body><p>Both values &gt;= 2<wbr></wbr></p></body></html>
             </td>
 
-            <td class="entry_notes">
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_V1">V1</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.lens.info.hyperfocalDistance">
-            <td class="entry_name"><html><body><p>android.lens.info.hyperfocalDistance<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.lens.info.hyperfocalDistance<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">float</span>
 
@@ -5704,22 +6097,30 @@
               <html><body><p>&gt;= 0<wbr></wbr></p></body></html>
             </td>
 
-            <td class="entry_notes">
-              <html><body><p>The hyperfocal distance is used for the old
-API's 'fixed' setting<wbr></wbr></p></body></html>
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
+              <html><body><p>The hyperfocal distance is used for the old
+API's 'fixed' setting<wbr></wbr></p></body></html>
+            </td>
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.lens.info.minimumFocusDistance">
-            <td class="entry_name"><html><body><p>android.lens.info.minimumFocusDistance<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.lens.info.minimumFocusDistance<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">float</span>
 
@@ -5741,22 +6142,30 @@
               <html><body><p>&gt;= 0<wbr></wbr></p></body></html>
             </td>
 
-            <td class="entry_notes">
-              <html><body><p>If the lens is fixed-focus, this should be
-0<wbr></wbr></p></body></html>
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_V1">V1</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
+              <html><body><p>If the lens is fixed-focus, this should be
+0<wbr></wbr></p></body></html>
+            </td>
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.lens.info.shadingMapSize">
-            <td class="entry_name"><html><body><p>android.lens.info.shadingMapSize<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.lens.info.shadingMapSize<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
                 <span class="entry_type_container">x</span>
@@ -5781,25 +6190,32 @@
               <html><body><p>Both values &gt;= 1<wbr></wbr></p></body></html>
             </td>
 
-            <td class="entry_notes">
-              <html><body><p>The map should be on the order of 30-40 rows and columns, and
-must be smaller than 64x64.<wbr></wbr></p></body></html>
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_V1">V1</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
+              <html><body><p>The map should be on the order of 30-40 rows and columns, and
+must be smaller than 64x64.<wbr></wbr></p></body></html>
+            </td>
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
         
         
 
                 
           <tr class="entry" id="static_android.lens.facing">
-            <td class="entry_name"><html><body><p>android.lens.facing<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                ><html><body><p>android.lens.facing<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -5827,17 +6243,18 @@
             <td class="entry_range">
             </td>
 
-            <td class="entry_notes">
-            </td>
-
             <td class="entry_tags">
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.lens.opticalAxisAngle">
-            <td class="entry_name"><html><body><p>android.lens.opticalAxisAngle<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.lens.opticalAxisAngle<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">float</span>
                 <span class="entry_type_container">x</span>
@@ -5863,7 +6280,18 @@
               <html><body><p>[0-90) for first angle, [0-360) for second<wbr></wbr></p></body></html>
             </td>
 
-            <td class="entry_notes">
+            <td class="entry_tags">
+              <ul class="entry_tags">
+                  <li><a href="#tag_ADV">ADV</a></li>
+              </ul>
+            </td>
+
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
               <html><body><p>Examples:</p>
 <p>(0,0) means that the camera optical axis
 is perpendicular to the display surface;</p>
@@ -5874,18 +6302,14 @@
 <p>Use FACING field to determine perpendicular outgoing
 direction<wbr></wbr></p></body></html>
             </td>
-
-            <td class="entry_tags">
-              <ul class="entry_tags">
-                  <li><a href="#tag_ADV">ADV</a></li>
-              </ul>
-            </td>
-
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.lens.position">
-            <td class="entry_name"><html><body><p>android.lens.position<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                ><html><body><p>android.lens.position<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">float</span>
                 <span class="entry_type_container">x</span>
@@ -5910,22 +6334,21 @@
             <td class="entry_range">
             </td>
 
-            <td class="entry_notes">
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_V1">V1</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
         
 
       <!-- end of kind -->
       </tbody>
-      <tr><td colspan="7" class="kind">dynamic</td></tr>
+      <tr><td colspan="6" class="kind">dynamic</td></tr>
 
       <thead class="entries_header">
         <tr>
@@ -5934,7 +6357,6 @@
           <th class="th_description">Description</th>
           <th class="th_units">Units</th>
           <th class="th_range">Range</th>
-          <th class="th_notes">Notes</th>
           <th class="th_tags">Tags</th>
         </tr>
       </thead>
@@ -5951,7 +6373,9 @@
 
                 
           <tr class="entry" id="dynamic_android.lens.aperture">
-            <td class="entry_name"><html><body><p>android.lens.aperture<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.lens.aperture<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">float</span>
 
@@ -5972,22 +6396,30 @@
               <html><body><p>android.lens.info.availableApertures<wbr></wbr></p></body></html>
             </td>
 
-            <td class="entry_notes">
-              <html><body><p>Will not be supported on most devices. Can only
-pick from supported list<wbr></wbr></p></body></html>
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_V1">V1</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
+              <html><body><p>Will not be supported on most devices. Can only
+pick from supported list<wbr></wbr></p></body></html>
+            </td>
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="dynamic_android.lens.filterDensity">
-            <td class="entry_name"><html><body><p>android.lens.filterDensity<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.lens.filterDensity<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">float</span>
 
@@ -6009,22 +6441,30 @@
               <html><body><p>android.lens.info.availableFilterDensities<wbr></wbr></p></body></html>
             </td>
 
-            <td class="entry_notes">
-              <html><body><p>Will not be supported on most devices. Can only
-pick from supported list<wbr></wbr></p></body></html>
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_V1">V1</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
+              <html><body><p>Will not be supported on most devices. Can only
+pick from supported list<wbr></wbr></p></body></html>
+            </td>
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="dynamic_android.lens.focalLength">
-            <td class="entry_name"><html><body><p>android.lens.focalLength<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.lens.focalLength<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">float</span>
 
@@ -6045,21 +6485,29 @@
               <html><body><p>&gt; 0<wbr></wbr></p></body></html>
             </td>
 
-            <td class="entry_notes">
-              <html><body><p>Will not be supported on most devices.<wbr></wbr></p></body></html>
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
+              <html><body><p>Will not be supported on most devices.<wbr></wbr></p></body></html>
+            </td>
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="dynamic_android.lens.focusDistance">
-            <td class="entry_name"><html><body><p>android.lens.focusDistance<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.lens.focusDistance<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">float</span>
 
@@ -6081,21 +6529,29 @@
               <html><body><p>&gt;= 0<wbr></wbr></p></body></html>
             </td>
 
-            <td class="entry_notes">
-              <html><body><p>Should be zero for fixed-focus cameras<wbr></wbr></p></body></html>
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
+              <html><body><p>Should be zero for fixed-focus cameras<wbr></wbr></p></body></html>
+            </td>
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="dynamic_android.lens.focusRange">
-            <td class="entry_name"><html><body><p>android.lens.focusRange<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.lens.focusRange<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">float</span>
                 <span class="entry_type_container">x</span>
@@ -6123,22 +6579,30 @@
               <html><body><p>&gt;=0<wbr></wbr></p></body></html>
             </td>
 
-            <td class="entry_notes">
-              <html><body><p>If variable focus not supported, can still report
-fixed depth of field range<wbr></wbr></p></body></html>
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
+              <html><body><p>If variable focus not supported, can still report
+fixed depth of field range<wbr></wbr></p></body></html>
+            </td>
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="dynamic_android.lens.opticalStabilizationMode">
-            <td class="entry_name"><html><body><p>android.lens.opticalStabilizationMode<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.lens.opticalStabilizationMode<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -6168,21 +6632,28 @@
               <html><body><p>android.lens.availableOpticalStabilization<wbr></wbr></p></body></html>
             </td>
 
-            <td class="entry_notes">
-              <html><body><p>Will not be supported on most devices.<wbr></wbr></p></body></html>
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_V1">V1</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
+              <html><body><p>Will not be supported on most devices.<wbr></wbr></p></body></html>
+            </td>
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="dynamic_android.lens.state">
-            <td class="entry_name"><html><body><p>android.lens.state<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                ><html><body><p>android.lens.state<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -6209,16 +6680,15 @@
             <td class="entry_range">
             </td>
 
-            <td class="entry_notes">
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_V1">V1</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
         
 
@@ -6226,10 +6696,10 @@
       </tbody>
 
   <!-- end of section -->
-  <tr><td colspan="7" id="section_noiseReduction" class="section">noiseReduction</td></tr>
+  <tr><td colspan="6" id="section_noiseReduction" class="section">noiseReduction</td></tr>
 
 
-      <tr><td colspan="7" class="kind">controls</td></tr>
+      <tr><td colspan="6" class="kind">controls</td></tr>
 
       <thead class="entries_header">
         <tr>
@@ -6238,7 +6708,6 @@
           <th class="th_description">Description</th>
           <th class="th_units">Units</th>
           <th class="th_range">Range</th>
-          <th class="th_notes">Notes</th>
           <th class="th_tags">Tags</th>
         </tr>
       </thead>
@@ -6255,7 +6724,9 @@
 
                 
           <tr class="entry" id="controls_android.noiseReduction.mode">
-            <td class="entry_name"><html><body><p>android.noiseReduction.mode<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.noiseReduction.mode<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -6292,7 +6763,18 @@
               <html><body><p>android.noiseReduction.availableModes<wbr></wbr></p></body></html>
             </td>
 
-            <td class="entry_notes">
+            <td class="entry_tags">
+              <ul class="entry_tags">
+                  <li><a href="#tag_V1">V1</a></li>
+              </ul>
+            </td>
+
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
               <html><body><p>Noise filtering control. OFF means no noise reduction
 will be applied by the HAL.</p>
 <p>FAST/HIGH_QUALITY both mean HAL-determined noise filtering
@@ -6301,18 +6783,14 @@
 even if it slows down capture rate. FAST means the HAL should not
 slow down capture rate when applying noise filtering.<wbr></wbr></p></body></html>
             </td>
-
-            <td class="entry_tags">
-              <ul class="entry_tags">
-                  <li><a href="#tag_V1">V1</a></li>
-              </ul>
-            </td>
-
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="controls_android.noiseReduction.strength">
-            <td class="entry_name"><html><body><p>android.noiseReduction.strength<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                ><html><body><p>android.noiseReduction.strength<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">byte</span>
 
@@ -6334,19 +6812,18 @@
               <html><body><p>1 - 10<wbr></wbr></p></body></html>
             </td>
 
-            <td class="entry_notes">
-            </td>
-
             <td class="entry_tags">
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
         
 
       <!-- end of kind -->
       </tbody>
-      <tr><td colspan="7" class="kind">dynamic</td></tr>
+      <tr><td colspan="6" class="kind">dynamic</td></tr>
 
       <thead class="entries_header">
         <tr>
@@ -6355,7 +6832,6 @@
           <th class="th_description">Description</th>
           <th class="th_units">Units</th>
           <th class="th_range">Range</th>
-          <th class="th_notes">Notes</th>
           <th class="th_tags">Tags</th>
         </tr>
       </thead>
@@ -6372,7 +6848,9 @@
 
                 
           <tr class="entry" id="dynamic_android.noiseReduction.mode">
-            <td class="entry_name"><html><body><p>android.noiseReduction.mode<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.noiseReduction.mode<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -6409,7 +6887,18 @@
               <html><body><p>android.noiseReduction.availableModes<wbr></wbr></p></body></html>
             </td>
 
-            <td class="entry_notes">
+            <td class="entry_tags">
+              <ul class="entry_tags">
+                  <li><a href="#tag_V1">V1</a></li>
+              </ul>
+            </td>
+
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
               <html><body><p>Noise filtering control. OFF means no noise reduction
 will be applied by the HAL.</p>
 <p>FAST/HIGH_QUALITY both mean HAL-determined noise filtering
@@ -6418,14 +6907,9 @@
 even if it slows down capture rate. FAST means the HAL should not
 slow down capture rate when applying noise filtering.<wbr></wbr></p></body></html>
             </td>
-
-            <td class="entry_tags">
-              <ul class="entry_tags">
-                  <li><a href="#tag_V1">V1</a></li>
-              </ul>
-            </td>
-
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
         
 
@@ -6433,10 +6917,10 @@
       </tbody>
 
   <!-- end of section -->
-  <tr><td colspan="7" id="section_quirks" class="section">quirks</td></tr>
+  <tr><td colspan="6" id="section_quirks" class="section">quirks</td></tr>
 
 
-      <tr><td colspan="7" class="kind">static</td></tr>
+      <tr><td colspan="6" class="kind">static</td></tr>
 
       <thead class="entries_header">
         <tr>
@@ -6445,7 +6929,6 @@
           <th class="th_description">Description</th>
           <th class="th_units">Units</th>
           <th class="th_range">Range</th>
-          <th class="th_notes">Notes</th>
           <th class="th_tags">Tags</th>
         </tr>
       </thead>
@@ -6462,7 +6945,9 @@
 
                 
           <tr class="entry" id="static_android.quirks.meteringCropRegion">
-            <td class="entry_name"><html><body><p>android.quirks.meteringCropRegion<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.quirks.meteringCropRegion<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">byte</span>
 
@@ -6484,7 +6969,15 @@
             <td class="entry_range">
             </td>
 
-            <td class="entry_notes">
+            <td class="entry_tags">
+            </td>
+
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
               <html><body><p>Normalized coordinates refer to those in the
 (-1000,1000) range mentioned in the
 android.hardware.Camera API.</p>
@@ -6493,15 +6986,15 @@
 not need to be listed in static metadata. Support will be
 removed in future versions of camera service.<wbr></wbr></p></body></html>
             </td>
-
-            <td class="entry_tags">
-            </td>
-
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.quirks.triggerAfWithAuto">
-            <td class="entry_name"><html><body><p>android.quirks.triggerAfWithAuto<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.quirks.triggerAfWithAuto<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">byte</span>
 
@@ -6522,22 +7015,30 @@
             <td class="entry_range">
             </td>
 
-            <td class="entry_notes">
+            <td class="entry_tags">
+            </td>
+
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
               <html><body><p>HAL implementations should implement AF trigger
 modes for AUTO, MACRO, CONTINUOUS_FOCUS, and
 CONTINUOUS_PICTURE modes instead of using this flag. Does
 not need to be listed in static metadata. Support will be
 removed in future versions of camera service<wbr></wbr></p></body></html>
             </td>
-
-            <td class="entry_tags">
-            </td>
-
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.quirks.useZslFormat">
-            <td class="entry_name"><html><body><p>android.quirks.useZslFormat<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.quirks.useZslFormat<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">byte</span>
 
@@ -6559,7 +7060,15 @@
             <td class="entry_range">
             </td>
 
-            <td class="entry_notes">
+            <td class="entry_tags">
+            </td>
+
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
               <html><body><p>HAL implementations should use gralloc usage flags
 to determine that a stream will be used for
 zero-shutter-lag, instead of relying on an explicit
@@ -6567,15 +7076,15 @@
 metadata. Support will be removed in future versions of
 camera service.<wbr></wbr></p></body></html>
             </td>
-
-            <td class="entry_tags">
-            </td>
-
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.quirks.usePartialResult">
-            <td class="entry_name"><html><body><p>android.quirks.usePartialResult<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.quirks.usePartialResult<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">byte</span>
 
@@ -6596,24 +7105,30 @@
             <td class="entry_range">
             </td>
 
-            <td class="entry_notes">
+            <td class="entry_tags">
+            </td>
+
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
               <html><body><p>Does not need to be listed in static
 metadata. Support for partial results will be reworked in
 future versions of camera service. This quirk will stop
 working at that point; DO NOT USE without careful
 consideration of future support.<wbr></wbr></p></body></html>
             </td>
-
-            <td class="entry_tags">
-            </td>
-
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
         
 
       <!-- end of kind -->
       </tbody>
-      <tr><td colspan="7" class="kind">dynamic</td></tr>
+      <tr><td colspan="6" class="kind">dynamic</td></tr>
 
       <thead class="entries_header">
         <tr>
@@ -6622,7 +7137,6 @@
           <th class="th_description">Description</th>
           <th class="th_units">Units</th>
           <th class="th_range">Range</th>
-          <th class="th_notes">Notes</th>
           <th class="th_tags">Tags</th>
         </tr>
       </thead>
@@ -6639,7 +7153,9 @@
 
                 
           <tr class="entry" id="dynamic_android.quirks.partialResult">
-            <td class="entry_name"><html><body><p>android.quirks.partialResult<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.quirks.partialResult<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -6676,7 +7192,15 @@
               <html><body><p>Optional. Default value is FINAL.<wbr></wbr></p></body></html>
             </td>
 
-            <td class="entry_notes">
+            <td class="entry_tags">
+            </td>
+
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
               <html><body><p>The entries in the result metadata buffers for a
 single capture may not overlap, except for this entry. The
 FINAL buffers must retain FIFO ordering relative to the
@@ -6687,11 +7211,9 @@
 capture must arrive before the FINAL buffer for that capture. This entry may
 only be used by the HAL if quirks.usePartialResult is set to 1.<wbr></wbr></p></body></html>
             </td>
-
-            <td class="entry_tags">
-            </td>
-
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
         
 
@@ -6699,10 +7221,10 @@
       </tbody>
 
   <!-- end of section -->
-  <tr><td colspan="7" id="section_request" class="section">request</td></tr>
+  <tr><td colspan="6" id="section_request" class="section">request</td></tr>
 
 
-      <tr><td colspan="7" class="kind">controls</td></tr>
+      <tr><td colspan="6" class="kind">controls</td></tr>
 
       <thead class="entries_header">
         <tr>
@@ -6711,7 +7233,6 @@
           <th class="th_description">Description</th>
           <th class="th_units">Units</th>
           <th class="th_range">Range</th>
-          <th class="th_notes">Notes</th>
           <th class="th_tags">Tags</th>
         </tr>
       </thead>
@@ -6728,7 +7249,8 @@
 
                 
           <tr class="entry" id="controls_android.request.frameCount">
-            <td class="entry_name"><html><body><p>android.request.frameCount<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                ><html><body><p>android.request.frameCount<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
 
@@ -6752,17 +7274,17 @@
               <html><body><p>Any int<wbr></wbr></p></body></html>
             </td>
 
-            <td class="entry_notes">
-            </td>
-
             <td class="entry_tags">
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="controls_android.request.id">
-            <td class="entry_name"><html><body><p>android.request.id<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                ><html><body><p>android.request.id<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
 
@@ -6785,20 +7307,21 @@
               <html><body><p>Any int<wbr></wbr></p></body></html>
             </td>
 
-            <td class="entry_notes">
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_V1">V1</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="controls_android.request.inputStreams">
-            <td class="entry_name"><html><body><p>android.request.inputStreams<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.request.inputStreams<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
                 <span class="entry_type_container">x</span>
@@ -6829,22 +7352,29 @@
           must be different scaled versions of the same image.<wbr></wbr></p></body></html>
             </td>
 
-            <td class="entry_notes">
-              <html><body><p>Only meaningful when android.request.type ==
-REPROCESS. Ignored otherwise<wbr></wbr></p></body></html>
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_HAL2">HAL2</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
+              <html><body><p>Only meaningful when android.request.type ==
+REPROCESS. Ignored otherwise<wbr></wbr></p></body></html>
+            </td>
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="controls_android.request.metadataMode">
-            <td class="entry_name"><html><body><p>android.request.metadataMode<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                ><html><body><p>android.request.metadataMode<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -6883,17 +7413,18 @@
             <td class="entry_range">
             </td>
 
-            <td class="entry_notes">
-            </td>
-
             <td class="entry_tags">
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="controls_android.request.outputStreams">
-            <td class="entry_name"><html><body><p>android.request.outputStreams<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.request.outputStreams<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
                 <span class="entry_type_container">x</span>
@@ -6920,24 +7451,31 @@
           created<wbr></wbr></p></body></html>
             </td>
 
-            <td class="entry_notes">
-              <html><body><p>If no output streams are listed, then the image
-data should simply be discarded. The image data must
-still be captured for metadata and statistics production,
-and the lens and flash must operate as requested.<wbr></wbr></p></body></html>
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_HAL2">HAL2</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
+              <html><body><p>If no output streams are listed, then the image
+data should simply be discarded. The image data must
+still be captured for metadata and statistics production,
+and the lens and flash must operate as requested.<wbr></wbr></p></body></html>
+            </td>
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="controls_android.request.type">
-            <td class="entry_name"><html><body><p>android.request.type<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                ><html><body><p>android.request.type<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -6972,22 +7510,21 @@
             <td class="entry_range">
             </td>
 
-            <td class="entry_notes">
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_HAL2">HAL2</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
         
 
       <!-- end of kind -->
       </tbody>
-      <tr><td colspan="7" class="kind">static</td></tr>
+      <tr><td colspan="6" class="kind">static</td></tr>
 
       <thead class="entries_header">
         <tr>
@@ -6996,7 +7533,6 @@
           <th class="th_description">Description</th>
           <th class="th_units">Units</th>
           <th class="th_range">Range</th>
-          <th class="th_notes">Notes</th>
           <th class="th_tags">Tags</th>
         </tr>
       </thead>
@@ -7013,7 +7549,9 @@
 
                 
           <tr class="entry" id="static_android.request.maxNumOutputStreams">
-            <td class="entry_name"><html><body><p>android.request.maxNumOutputStreams<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.request.maxNumOutputStreams<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
                 <span class="entry_type_container">x</span>
@@ -7042,23 +7580,30 @@
           for processed, uncompressed streams<wbr></wbr></p></body></html>
             </td>
 
-            <td class="entry_notes">
-              <html><body><p>Video snapshot with preview callbacks requires 3
-processed streams (preview, record, app callbacks) and
-one JPEG stream (snapshot)<wbr></wbr></p></body></html>
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
+              <html><body><p>Video snapshot with preview callbacks requires 3
+processed streams (preview, record, app callbacks) and
+one JPEG stream (snapshot)<wbr></wbr></p></body></html>
+            </td>
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.request.maxNumReprocessStreams">
-            <td class="entry_name"><html><body><p>android.request.maxNumReprocessStreams<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                ><html><body><p>android.request.maxNumReprocessStreams<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
                 <span class="entry_type_container">x</span>
@@ -7083,19 +7628,18 @@
               <html><body><p>&gt;= 1<wbr></wbr></p></body></html>
             </td>
 
-            <td class="entry_notes">
-            </td>
-
             <td class="entry_tags">
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
         
 
       <!-- end of kind -->
       </tbody>
-      <tr><td colspan="7" class="kind">dynamic</td></tr>
+      <tr><td colspan="6" class="kind">dynamic</td></tr>
 
       <thead class="entries_header">
         <tr>
@@ -7104,7 +7648,6 @@
           <th class="th_description">Description</th>
           <th class="th_units">Units</th>
           <th class="th_range">Range</th>
-          <th class="th_notes">Notes</th>
           <th class="th_tags">Tags</th>
         </tr>
       </thead>
@@ -7121,7 +7664,9 @@
 
                 
           <tr class="entry" id="dynamic_android.request.frameCount">
-            <td class="entry_name"><html><body><p>android.request.frameCount<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.request.frameCount<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
 
@@ -7144,18 +7689,25 @@
               <html><body><p>&gt; 0<wbr></wbr></p></body></html>
             </td>
 
-            <td class="entry_notes">
-              <html><body><p>Reset on release()<wbr></wbr></p></body></html>
-            </td>
-
             <td class="entry_tags">
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
+              <html><body><p>Reset on release()<wbr></wbr></p></body></html>
+            </td>
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="dynamic_android.request.id">
-            <td class="entry_name"><html><body><p>android.request.id<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                ><html><body><p>android.request.id<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
 
@@ -7178,20 +7730,20 @@
               <html><body><p>Any int<wbr></wbr></p></body></html>
             </td>
 
-            <td class="entry_notes">
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_V1">V1</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="dynamic_android.request.metadataMode">
-            <td class="entry_name"><html><body><p>android.request.metadataMode<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                ><html><body><p>android.request.metadataMode<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -7230,17 +7782,18 @@
             <td class="entry_range">
             </td>
 
-            <td class="entry_notes">
-            </td>
-
             <td class="entry_tags">
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="dynamic_android.request.outputStreams">
-            <td class="entry_name"><html><body><p>android.request.outputStreams<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.request.outputStreams<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
                 <span class="entry_type_container">x</span>
@@ -7267,20 +7820,26 @@
           created<wbr></wbr></p></body></html>
             </td>
 
-            <td class="entry_notes">
-              <html><body><p>If no output streams are listed, then the image
-data should simply be discarded. The image data must
-still be captured for metadata and statistics production,
-and the lens and flash must operate as requested.<wbr></wbr></p></body></html>
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_HAL2">HAL2</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
+              <html><body><p>If no output streams are listed, then the image
+data should simply be discarded. The image data must
+still be captured for metadata and statistics production,
+and the lens and flash must operate as requested.<wbr></wbr></p></body></html>
+            </td>
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
         
 
@@ -7288,10 +7847,10 @@
       </tbody>
 
   <!-- end of section -->
-  <tr><td colspan="7" id="section_scaler" class="section">scaler</td></tr>
+  <tr><td colspan="6" id="section_scaler" class="section">scaler</td></tr>
 
 
-      <tr><td colspan="7" class="kind">controls</td></tr>
+      <tr><td colspan="6" class="kind">controls</td></tr>
 
       <thead class="entries_header">
         <tr>
@@ -7300,7 +7859,6 @@
           <th class="th_description">Description</th>
           <th class="th_units">Units</th>
           <th class="th_range">Range</th>
-          <th class="th_notes">Notes</th>
           <th class="th_tags">Tags</th>
         </tr>
       </thead>
@@ -7317,7 +7875,9 @@
 
                 
           <tr class="entry" id="controls_android.scaler.cropRegion">
-            <td class="entry_name"><html><body><p>android.scaler.cropRegion<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.scaler.cropRegion<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
                 <span class="entry_type_container">x</span>
@@ -7349,7 +7909,18 @@
             <td class="entry_range">
             </td>
 
-            <td class="entry_notes">
+            <td class="entry_tags">
+              <ul class="entry_tags">
+                  <li><a href="#tag_BC">BC</a></li>
+              </ul>
+            </td>
+
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
               <html><body><p>Any additional per-stream cropping must be done to
 maximize the final pixel area of the stream.</p>
 <p>For example, if the crop region is set to a 4:3 aspect
@@ -7373,20 +7944,15 @@
 activeArraySize.height / android.scaler.maxDigitalZoom),
 respectively.<wbr></wbr></p></body></html>
             </td>
-
-            <td class="entry_tags">
-              <ul class="entry_tags">
-                  <li><a href="#tag_BC">BC</a></li>
-              </ul>
-            </td>
-
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
         
 
       <!-- end of kind -->
       </tbody>
-      <tr><td colspan="7" class="kind">static</td></tr>
+      <tr><td colspan="6" class="kind">static</td></tr>
 
       <thead class="entries_header">
         <tr>
@@ -7395,7 +7961,6 @@
           <th class="th_description">Description</th>
           <th class="th_units">Units</th>
           <th class="th_range">Range</th>
-          <th class="th_notes">Notes</th>
           <th class="th_tags">Tags</th>
         </tr>
       </thead>
@@ -7412,7 +7977,8 @@
 
                 
           <tr class="entry" id="static_android.scaler.availableFormats">
-            <td class="entry_name"><html><body><p>android.scaler.availableFormats<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                ><html><body><p>android.scaler.availableFormats<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">int32</span>
                 <span class="entry_type_container">x</span>
@@ -7467,20 +8033,21 @@
             <td class="entry_range">
             </td>
 
-            <td class="entry_notes">
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.scaler.availableJpegMinDurations">
-            <td class="entry_name"><html><body><p>android.scaler.availableJpegMinDurations<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.scaler.availableJpegMinDurations<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">int64</span>
                 <span class="entry_type_container">x</span>
@@ -7507,23 +8074,30 @@
             <td class="entry_range">
             </td>
 
-            <td class="entry_notes">
-              <html><body><p>When multiple streams are configured, the minimum
-frame duration will be &gt;= max(individual stream min
-durations)<wbr></wbr></p></body></html>
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
+              <html><body><p>When multiple streams are configured, the minimum
+frame duration will be &gt;= max(individual stream min
+durations)<wbr></wbr></p></body></html>
+            </td>
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.scaler.availableJpegSizes">
-            <td class="entry_name"><html><body><p>android.scaler.availableJpegSizes<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                ><html><body><p>android.scaler.availableJpegSizes<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
                 <span class="entry_type_container">x</span>
@@ -7549,20 +8123,20 @@
           include: - half/quarter max resolution<wbr></wbr></p></body></html>
             </td>
 
-            <td class="entry_notes">
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.scaler.availableMaxDigitalZoom">
-            <td class="entry_name"><html><body><p>android.scaler.availableMaxDigitalZoom<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                ><html><body><p>android.scaler.availableMaxDigitalZoom<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">float</span>
 
@@ -7585,20 +8159,21 @@
               <html><body><p>&gt;=1<wbr></wbr></p></body></html>
             </td>
 
-            <td class="entry_notes">
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.scaler.availableProcessedMinDurations">
-            <td class="entry_name"><html><body><p>android.scaler.availableProcessedMinDurations<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.scaler.availableProcessedMinDurations<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">int64</span>
                 <span class="entry_type_container">x</span>
@@ -7625,23 +8200,31 @@
             <td class="entry_range">
             </td>
 
-            <td class="entry_notes">
-              <html><body><p>When multiple streams are configured, the minimum
-frame duration will be &gt;= max(individual stream min
-durations)<wbr></wbr></p></body></html>
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
+              <html><body><p>When multiple streams are configured, the minimum
+frame duration will be &gt;= max(individual stream min
+durations)<wbr></wbr></p></body></html>
+            </td>
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.scaler.availableProcessedSizes">
-            <td class="entry_name"><html><body><p>android.scaler.availableProcessedSizes<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.scaler.availableProcessedSizes<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
                 <span class="entry_type_container">x</span>
@@ -7670,7 +8253,18 @@
           resolutions<wbr></wbr></p></body></html>
             </td>
 
-            <td class="entry_notes">
+            <td class="entry_tags">
+              <ul class="entry_tags">
+                  <li><a href="#tag_BC">BC</a></li>
+              </ul>
+            </td>
+
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
               <html><body><p>The actual supported resolution list may be limited by
 consumer end points for different use cases. For example, for
 recording use case, the largest supported resolution may be
@@ -7678,18 +8272,15 @@
 case, the largest supported resolution may be limited by max
 resolution SurfaceTexture/SurfaceView can support.<wbr></wbr></p></body></html>
             </td>
-
-            <td class="entry_tags">
-              <ul class="entry_tags">
-                  <li><a href="#tag_BC">BC</a></li>
-              </ul>
-            </td>
-
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.scaler.availableRawMinDurations">
-            <td class="entry_name"><html><body><p>android.scaler.availableRawMinDurations<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.scaler.availableRawMinDurations<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">int64</span>
                 <span class="entry_type_container">x</span>
@@ -7715,23 +8306,30 @@
             <td class="entry_range">
             </td>
 
-            <td class="entry_notes">
-              <html><body><p>When multiple streams are configured, the minimum
-frame duration will be &gt;= max(individual stream min
-durations)<wbr></wbr></p></body></html>
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
+              <html><body><p>When multiple streams are configured, the minimum
+frame duration will be &gt;= max(individual stream min
+durations)<wbr></wbr></p></body></html>
+            </td>
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.scaler.availableRawSizes">
-            <td class="entry_name"><html><body><p>android.scaler.availableRawSizes<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                ><html><body><p>android.scaler.availableRawSizes<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
                 <span class="entry_type_container">x</span>
@@ -7757,19 +8355,18 @@
               <html><body><p>Must include: - sensor maximum resolution<wbr></wbr></p></body></html>
             </td>
 
-            <td class="entry_notes">
-            </td>
-
             <td class="entry_tags">
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
         
 
       <!-- end of kind -->
       </tbody>
-      <tr><td colspan="7" class="kind">dynamic</td></tr>
+      <tr><td colspan="6" class="kind">dynamic</td></tr>
 
       <thead class="entries_header">
         <tr>
@@ -7778,7 +8375,6 @@
           <th class="th_description">Description</th>
           <th class="th_units">Units</th>
           <th class="th_range">Range</th>
-          <th class="th_notes">Notes</th>
           <th class="th_tags">Tags</th>
         </tr>
       </thead>
@@ -7795,7 +8391,9 @@
 
                 
           <tr class="entry" id="dynamic_android.scaler.cropRegion">
-            <td class="entry_name"><html><body><p>android.scaler.cropRegion<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.scaler.cropRegion<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
                 <span class="entry_type_container">x</span>
@@ -7827,7 +8425,18 @@
             <td class="entry_range">
             </td>
 
-            <td class="entry_notes">
+            <td class="entry_tags">
+              <ul class="entry_tags">
+                  <li><a href="#tag_BC">BC</a></li>
+              </ul>
+            </td>
+
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
               <html><body><p>Any additional per-stream cropping must be done to
 maximize the final pixel area of the stream.</p>
 <p>For example, if the crop region is set to a 4:3 aspect
@@ -7851,14 +8460,9 @@
 activeArraySize.height / android.scaler.maxDigitalZoom),
 respectively.<wbr></wbr></p></body></html>
             </td>
-
-            <td class="entry_tags">
-              <ul class="entry_tags">
-                  <li><a href="#tag_BC">BC</a></li>
-              </ul>
-            </td>
-
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
         
 
@@ -7866,10 +8470,10 @@
       </tbody>
 
   <!-- end of section -->
-  <tr><td colspan="7" id="section_sensor" class="section">sensor</td></tr>
+  <tr><td colspan="6" id="section_sensor" class="section">sensor</td></tr>
 
 
-      <tr><td colspan="7" class="kind">controls</td></tr>
+      <tr><td colspan="6" class="kind">controls</td></tr>
 
       <thead class="entries_header">
         <tr>
@@ -7878,7 +8482,6 @@
           <th class="th_description">Description</th>
           <th class="th_units">Units</th>
           <th class="th_range">Range</th>
-          <th class="th_notes">Notes</th>
           <th class="th_tags">Tags</th>
         </tr>
       </thead>
@@ -7895,7 +8498,9 @@
 
                 
           <tr class="entry" id="controls_android.sensor.exposureTime">
-            <td class="entry_name"><html><body><p>android.sensor.exposureTime<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.sensor.exposureTime<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">int64</span>
 
@@ -7919,21 +8524,29 @@
               <html><body><p>android.sensor.info.exposureTimeRange<wbr></wbr></p></body></html>
             </td>
 
-            <td class="entry_notes">
-              <html><body><p>1/10000 - 30 sec range. No bulb mode<wbr></wbr></p></body></html>
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_V1">V1</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
+              <html><body><p>1/10000 - 30 sec range. No bulb mode<wbr></wbr></p></body></html>
+            </td>
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="controls_android.sensor.frameDuration">
-            <td class="entry_name"><html><body><p>android.sensor.frameDuration<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.sensor.frameDuration<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">int64</span>
 
@@ -7956,11 +8569,6 @@
           android.scaler.info.availableMinFrameDurations<wbr></wbr></p></body></html>
             </td>
 
-            <td class="entry_notes">
-              <html><body><p>Exposure time has priority, so duration is set to
-max(duration, exposure time + overhead)<wbr></wbr></p></body></html>
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_V1">V1</a></li>
@@ -7968,11 +8576,24 @@
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
+              <html><body><p>Exposure time has priority, so duration is set to
+max(duration, exposure time + overhead)<wbr></wbr></p></body></html>
+            </td>
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="controls_android.sensor.sensitivity">
-            <td class="entry_name"><html><body><p>android.sensor.sensitivity<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.sensor.sensitivity<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
 
@@ -7997,23 +8618,29 @@
               <html><body><p>android.sensor.info.sensitivityRange<wbr></wbr></p></body></html>
             </td>
 
-            <td class="entry_notes">
-              <html><body><p>ISO 12232:2006 REI method<wbr></wbr></p></body></html>
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_V1">V1</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
+              <html><body><p>ISO 12232:2006 REI method<wbr></wbr></p></body></html>
+            </td>
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
         
 
       <!-- end of kind -->
       </tbody>
-      <tr><td colspan="7" class="kind">static</td></tr>
+      <tr><td colspan="6" class="kind">static</td></tr>
 
       <thead class="entries_header">
         <tr>
@@ -8022,7 +8649,6 @@
           <th class="th_description">Description</th>
           <th class="th_units">Units</th>
           <th class="th_range">Range</th>
-          <th class="th_notes">Notes</th>
           <th class="th_tags">Tags</th>
         </tr>
       </thead>
@@ -8041,7 +8667,8 @@
 
                 
           <tr class="entry" id="static_android.sensor.info.activeArraySize">
-            <td class="entry_name"><html><body><p>android.sensor.info.activeArraySize<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                ><html><body><p>android.sensor.info.activeArraySize<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
                 <span class="entry_type_container">x</span>
@@ -8069,20 +8696,20 @@
             <td class="entry_range">
             </td>
 
-            <td class="entry_notes">
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_DNG">DNG</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.sensor.info.sensitivityRange">
-            <td class="entry_name"><html><body><p>android.sensor.info.sensitivityRange<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                ><html><body><p>android.sensor.info.sensitivityRange<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
                 <span class="entry_type_container">x</span>
@@ -8107,9 +8734,6 @@
               <html><body><p>Min = 1600<wbr></wbr></p></body></html>
             </td>
 
-            <td class="entry_notes">
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_BC">BC</a></li>
@@ -8117,11 +8741,14 @@
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.sensor.info.colorFilterArrangement">
-            <td class="entry_name"><html><body><p>android.sensor.info.colorFilterArrangement<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                ><html><body><p>android.sensor.info.colorFilterArrangement<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -8162,20 +8789,20 @@
             <td class="entry_range">
             </td>
 
-            <td class="entry_notes">
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_DNG">DNG</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.sensor.info.exposureTimeRange">
-            <td class="entry_name"><html><body><p>android.sensor.info.exposureTimeRange<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                ><html><body><p>android.sensor.info.exposureTimeRange<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">int64</span>
                 <span class="entry_type_container">x</span>
@@ -8202,20 +8829,21 @@
             sec)<wbr></wbr></p></body></html>
             </td>
 
-            <td class="entry_notes">
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_V1">V1</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.sensor.info.maxFrameDuration">
-            <td class="entry_name"><html><body><p>android.sensor.info.maxFrameDuration<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.sensor.info.maxFrameDuration<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">int64</span>
 
@@ -8237,14 +8865,6 @@
               <html><body><p>&gt;= 30e9<wbr></wbr></p></body></html>
             </td>
 
-            <td class="entry_notes">
-              <html><body><p>Minimum duration is a function of resolution,
-processing settings. See
-android.scaler.availableProcessedMinDurations
-android.scaler.availableJpegMinDurations
-android.scaler.availableRawMinDurations<wbr></wbr></p></body></html>
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_BC">BC</a></li>
@@ -8252,11 +8872,27 @@
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
+              <html><body><p>Minimum duration is a function of resolution,
+processing settings. See
+android.scaler.availableProcessedMinDurations
+android.scaler.availableJpegMinDurations
+android.scaler.availableRawMinDurations<wbr></wbr></p></body></html>
+            </td>
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.sensor.info.physicalSize">
-            <td class="entry_name"><html><body><p>android.sensor.info.physicalSize<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.sensor.info.physicalSize<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">float</span>
                 <span class="entry_type_container">x</span>
@@ -8281,10 +8917,6 @@
             <td class="entry_range">
             </td>
 
-            <td class="entry_notes">
-              <html><body><p>Needed for FOV calculation for old API<wbr></wbr></p></body></html>
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_V1">V1</a></li>
@@ -8292,11 +8924,23 @@
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
+              <html><body><p>Needed for FOV calculation for old API<wbr></wbr></p></body></html>
+            </td>
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.sensor.info.pixelArraySize">
-            <td class="entry_name"><html><body><p>android.sensor.info.pixelArraySize<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.sensor.info.pixelArraySize<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
                 <span class="entry_type_container">x</span>
@@ -8320,12 +8964,6 @@
             <td class="entry_range">
             </td>
 
-            <td class="entry_notes">
-              <html><body><p>Maximum output resolution for raw format must
-match this in
-android.scaler.info.availableSizesPerFormat<wbr></wbr></p></body></html>
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_DNG">DNG</a></li>
@@ -8333,11 +8971,25 @@
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
+              <html><body><p>Maximum output resolution for raw format must
+match this in
+android.scaler.info.availableSizesPerFormat<wbr></wbr></p></body></html>
+            </td>
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.sensor.info.whiteLevel">
-            <td class="entry_name"><html><body><p>android.sensor.info.whiteLevel<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.sensor.info.whiteLevel<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
 
@@ -8358,25 +9010,32 @@
               <html><body><p>&gt; 1024 (10-bit output)<wbr></wbr></p></body></html>
             </td>
 
-            <td class="entry_notes">
-              <html><body><p>Defines sensor bit depth (10-14 bits is
-expected)<wbr></wbr></p></body></html>
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_DNG">DNG</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
+              <html><body><p>Defines sensor bit depth (10-14 bits is
+expected)<wbr></wbr></p></body></html>
+            </td>
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
         
         
 
                 
           <tr class="entry" id="static_android.sensor.baseGainFactor">
-            <td class="entry_name"><html><body><p>android.sensor.baseGainFactor<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                ><html><body><p>android.sensor.baseGainFactor<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">rational</span>
 
@@ -8396,9 +9055,6 @@
             <td class="entry_range">
             </td>
 
-            <td class="entry_notes">
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_V1">V1</a></li>
@@ -8406,11 +9062,15 @@
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.sensor.blackLevelPattern">
-            <td class="entry_name"><html><body><p>android.sensor.blackLevelPattern<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.sensor.blackLevelPattern<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
                 <span class="entry_type_container">x</span>
@@ -8436,22 +9096,29 @@
               <html><body><p>&gt;= 0 each<wbr></wbr></p></body></html>
             </td>
 
-            <td class="entry_notes">
-              <html><body><p>As per DNG BlackLevelRepeatDim / BlackLevel
-tags<wbr></wbr></p></body></html>
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_DNG">DNG</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
+              <html><body><p>As per DNG BlackLevelRepeatDim / BlackLevel
+tags<wbr></wbr></p></body></html>
+            </td>
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.sensor.calibrationTransform1">
-            <td class="entry_name"><html><body><p>android.sensor.calibrationTransform1<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                ><html><body><p>android.sensor.calibrationTransform1<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">rational</span>
                 <span class="entry_type_container">x</span>
@@ -8476,20 +9143,20 @@
             <td class="entry_range">
             </td>
 
-            <td class="entry_notes">
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_DNG">DNG</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.sensor.calibrationTransform2">
-            <td class="entry_name"><html><body><p>android.sensor.calibrationTransform2<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                ><html><body><p>android.sensor.calibrationTransform2<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">rational</span>
                 <span class="entry_type_container">x</span>
@@ -8514,20 +9181,21 @@
             <td class="entry_range">
             </td>
 
-            <td class="entry_notes">
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_DNG">DNG</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.sensor.colorTransform1">
-            <td class="entry_name"><html><body><p>android.sensor.colorTransform1<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.sensor.colorTransform1<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">rational</span>
                 <span class="entry_type_container">x</span>
@@ -8553,23 +9221,30 @@
             <td class="entry_range">
             </td>
 
-            <td class="entry_notes">
-              <html><body><p>Use as follows XYZ = inv(transform) * clip( (raw -
-black level(raw) ) / ( white level - max black level) ).
-At least in the simple case<wbr></wbr></p></body></html>
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_DNG">DNG</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
+              <html><body><p>Use as follows XYZ = inv(transform) * clip( (raw -
+black level(raw) ) / ( white level - max black level) ).
+At least in the simple case<wbr></wbr></p></body></html>
+            </td>
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.sensor.colorTransform2">
-            <td class="entry_name"><html><body><p>android.sensor.colorTransform2<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                ><html><body><p>android.sensor.colorTransform2<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">rational</span>
                 <span class="entry_type_container">x</span>
@@ -8595,20 +9270,20 @@
             <td class="entry_range">
             </td>
 
-            <td class="entry_notes">
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_DNG">DNG</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.sensor.forwardMatrix1">
-            <td class="entry_name"><html><body><p>android.sensor.forwardMatrix1<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                ><html><body><p>android.sensor.forwardMatrix1<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">rational</span>
                 <span class="entry_type_container">x</span>
@@ -8633,20 +9308,20 @@
             <td class="entry_range">
             </td>
 
-            <td class="entry_notes">
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_DNG">DNG</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.sensor.forwardMatrix2">
-            <td class="entry_name"><html><body><p>android.sensor.forwardMatrix2<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                ><html><body><p>android.sensor.forwardMatrix2<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">rational</span>
                 <span class="entry_type_container">x</span>
@@ -8671,20 +9346,21 @@
             <td class="entry_range">
             </td>
 
-            <td class="entry_notes">
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_DNG">DNG</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.sensor.maxAnalogSensitivity">
-            <td class="entry_name"><html><body><p>android.sensor.maxAnalogSensitivity<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.sensor.maxAnalogSensitivity<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
 
@@ -8704,13 +9380,6 @@
             <td class="entry_range">
             </td>
 
-            <td class="entry_notes">
-              <html><body><p>For android.sensor.sensitivity values less than or
-equal to this, all applied gain must be analog. For
-values above this, it can be a mix of analog and
-digital<wbr></wbr></p></body></html>
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_V1">V1</a></li>
@@ -8718,11 +9387,26 @@
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
+              <html><body><p>For android.sensor.sensitivity values less than or
+equal to this, all applied gain must be analog. For
+values above this, it can be a mix of analog and
+digital<wbr></wbr></p></body></html>
+            </td>
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.sensor.noiseModelCoefficients">
-            <td class="entry_name"><html><body><p>android.sensor.noiseModelCoefficients<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.sensor.noiseModelCoefficients<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">float</span>
                 <span class="entry_type_container">x</span>
@@ -8750,25 +9434,32 @@
             <td class="entry_range">
             </td>
 
-            <td class="entry_notes">
-              <html><body><p>A represents sensor read noise before analog
-amplification; B represents noise from A/D conversion and
-other circuits after amplification. Both noise sources
-are assumed to be gaussian, independent, and not to vary
-across the sensor<wbr></wbr></p></body></html>
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_V1">V1</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
+              <html><body><p>A represents sensor read noise before analog
+amplification; B represents noise from A/D conversion and
+other circuits after amplification. Both noise sources
+are assumed to be gaussian, independent, and not to vary
+across the sensor<wbr></wbr></p></body></html>
+            </td>
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.sensor.orientation">
-            <td class="entry_name"><html><body><p>android.sensor.orientation<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                ><html><body><p>android.sensor.orientation<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
 
@@ -8794,20 +9485,21 @@
               <html><body><p>0,90,180,270<wbr></wbr></p></body></html>
             </td>
 
-            <td class="entry_notes">
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.sensor.referenceIlluminant1">
-            <td class="entry_name"><html><body><p>android.sensor.referenceIlluminant1<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.sensor.referenceIlluminant1<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -8910,11 +9602,6 @@
             <td class="entry_range">
             </td>
 
-            <td class="entry_notes">
-              <html><body><p>[EXIF LightSource tag] Must all these be
-supported? Need CCT for each!<wbr></wbr></p></body></html>
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_DNG">DNG</a></li>
@@ -8922,11 +9609,23 @@
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
+              <html><body><p>[EXIF LightSource tag] Must all these be
+supported? Need CCT for each!<wbr></wbr></p></body></html>
+            </td>
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.sensor.referenceIlluminant2">
-            <td class="entry_name"><html><body><p>android.sensor.referenceIlluminant2<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                ><html><body><p>android.sensor.referenceIlluminant2<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">byte</span>
 
@@ -8947,19 +9646,18 @@
             <td class="entry_range">
             </td>
 
-            <td class="entry_notes">
-            </td>
-
             <td class="entry_tags">
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
         
 
       <!-- end of kind -->
       </tbody>
-      <tr><td colspan="7" class="kind">dynamic</td></tr>
+      <tr><td colspan="6" class="kind">dynamic</td></tr>
 
       <thead class="entries_header">
         <tr>
@@ -8968,7 +9666,6 @@
           <th class="th_description">Description</th>
           <th class="th_units">Units</th>
           <th class="th_range">Range</th>
-          <th class="th_notes">Notes</th>
           <th class="th_tags">Tags</th>
         </tr>
       </thead>
@@ -8985,7 +9682,9 @@
 
                 
           <tr class="entry" id="dynamic_android.sensor.exposureTime">
-            <td class="entry_name"><html><body><p>android.sensor.exposureTime<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.sensor.exposureTime<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">int64</span>
 
@@ -9009,21 +9708,29 @@
               <html><body><p>android.sensor.info.exposureTimeRange<wbr></wbr></p></body></html>
             </td>
 
-            <td class="entry_notes">
-              <html><body><p>1/10000 - 30 sec range. No bulb mode<wbr></wbr></p></body></html>
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_V1">V1</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
+              <html><body><p>1/10000 - 30 sec range. No bulb mode<wbr></wbr></p></body></html>
+            </td>
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="dynamic_android.sensor.frameDuration">
-            <td class="entry_name"><html><body><p>android.sensor.frameDuration<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.sensor.frameDuration<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">int64</span>
 
@@ -9046,11 +9753,6 @@
           android.scaler.info.availableMinFrameDurations<wbr></wbr></p></body></html>
             </td>
 
-            <td class="entry_notes">
-              <html><body><p>Exposure time has priority, so duration is set to
-max(duration, exposure time + overhead)<wbr></wbr></p></body></html>
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_V1">V1</a></li>
@@ -9058,11 +9760,24 @@
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
+              <html><body><p>Exposure time has priority, so duration is set to
+max(duration, exposure time + overhead)<wbr></wbr></p></body></html>
+            </td>
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="dynamic_android.sensor.sensitivity">
-            <td class="entry_name"><html><body><p>android.sensor.sensitivity<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.sensor.sensitivity<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
 
@@ -9087,21 +9802,29 @@
               <html><body><p>android.sensor.info.sensitivityRange<wbr></wbr></p></body></html>
             </td>
 
-            <td class="entry_notes">
-              <html><body><p>ISO 12232:2006 REI method<wbr></wbr></p></body></html>
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_V1">V1</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
+              <html><body><p>ISO 12232:2006 REI method<wbr></wbr></p></body></html>
+            </td>
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="dynamic_android.sensor.timestamp">
-            <td class="entry_name"><html><body><p>android.sensor.timestamp<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.sensor.timestamp<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">int64</span>
 
@@ -9123,22 +9846,29 @@
               <html><body><p>&gt; 0<wbr></wbr></p></body></html>
             </td>
 
-            <td class="entry_notes">
-              <html><body><p>Monotonic, should be synced to other timestamps in
-system<wbr></wbr></p></body></html>
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
+              <html><body><p>Monotonic, should be synced to other timestamps in
+system<wbr></wbr></p></body></html>
+            </td>
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="dynamic_android.sensor.temperature">
-            <td class="entry_name"><html><body><p>android.sensor.temperature<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                ><html><body><p>android.sensor.temperature<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">float</span>
 
@@ -9162,16 +9892,15 @@
               <html><body><p>Optional. This value is missing if no temperature is available.<wbr></wbr></p></body></html>
             </td>
 
-            <td class="entry_notes">
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_FULL">FULL</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
         
 
@@ -9179,10 +9908,10 @@
       </tbody>
 
   <!-- end of section -->
-  <tr><td colspan="7" id="section_shading" class="section">shading</td></tr>
+  <tr><td colspan="6" id="section_shading" class="section">shading</td></tr>
 
 
-      <tr><td colspan="7" class="kind">controls</td></tr>
+      <tr><td colspan="6" class="kind">controls</td></tr>
 
       <thead class="entries_header">
         <tr>
@@ -9191,7 +9920,6 @@
           <th class="th_description">Description</th>
           <th class="th_units">Units</th>
           <th class="th_range">Range</th>
-          <th class="th_notes">Notes</th>
           <th class="th_tags">Tags</th>
         </tr>
       </thead>
@@ -9208,7 +9936,8 @@
 
                 
           <tr class="entry" id="controls_android.shading.mode">
-            <td class="entry_name"><html><body><p>android.shading.mode<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                ><html><body><p>android.shading.mode<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -9244,17 +9973,17 @@
             <td class="entry_range">
             </td>
 
-            <td class="entry_notes">
-            </td>
-
             <td class="entry_tags">
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="controls_android.shading.strength">
-            <td class="entry_name"><html><body><p>android.shading.strength<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                ><html><body><p>android.shading.strength<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">byte</span>
 
@@ -9276,22 +10005,21 @@
             <td class="entry_range">
             </td>
 
-            <td class="entry_notes">
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_ADV">ADV</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
         
 
       <!-- end of kind -->
       </tbody>
-      <tr><td colspan="7" class="kind">dynamic</td></tr>
+      <tr><td colspan="6" class="kind">dynamic</td></tr>
 
       <thead class="entries_header">
         <tr>
@@ -9300,7 +10028,6 @@
           <th class="th_description">Description</th>
           <th class="th_units">Units</th>
           <th class="th_range">Range</th>
-          <th class="th_notes">Notes</th>
           <th class="th_tags">Tags</th>
         </tr>
       </thead>
@@ -9317,7 +10044,8 @@
 
                 
           <tr class="entry" id="dynamic_android.shading.mode">
-            <td class="entry_name"><html><body><p>android.shading.mode<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                ><html><body><p>android.shading.mode<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -9353,13 +10081,12 @@
             <td class="entry_range">
             </td>
 
-            <td class="entry_notes">
-            </td>
-
             <td class="entry_tags">
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
         
 
@@ -9367,10 +10094,10 @@
       </tbody>
 
   <!-- end of section -->
-  <tr><td colspan="7" id="section_statistics" class="section">statistics</td></tr>
+  <tr><td colspan="6" id="section_statistics" class="section">statistics</td></tr>
 
 
-      <tr><td colspan="7" class="kind">controls</td></tr>
+      <tr><td colspan="6" class="kind">controls</td></tr>
 
       <thead class="entries_header">
         <tr>
@@ -9379,7 +10106,6 @@
           <th class="th_description">Description</th>
           <th class="th_units">Units</th>
           <th class="th_range">Range</th>
-          <th class="th_notes">Notes</th>
           <th class="th_tags">Tags</th>
         </tr>
       </thead>
@@ -9396,7 +10122,9 @@
 
                 
           <tr class="entry" id="controls_android.statistics.faceDetectMode">
-            <td class="entry_name"><html><body><p>android.statistics.faceDetectMode<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.statistics.faceDetectMode<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -9432,24 +10160,31 @@
               <html><body><p>android.statistics.info.availableFaceDetectModes<wbr></wbr></p></body></html>
             </td>
 
-            <td class="entry_notes">
-              <html><body><p>Whether face detection is enabled, and whether it
-should output just the basic fields or the full set of
-fields. Value must be one of the
-android.statistics.info.availableFaceDetectModes.<wbr></wbr></p></body></html>
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
+              <html><body><p>Whether face detection is enabled, and whether it
+should output just the basic fields or the full set of
+fields. Value must be one of the
+android.statistics.info.availableFaceDetectModes.<wbr></wbr></p></body></html>
+            </td>
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="controls_android.statistics.histogramMode">
-            <td class="entry_name"><html><body><p>android.statistics.histogramMode<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                ><html><body><p>android.statistics.histogramMode<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -9477,20 +10212,20 @@
             <td class="entry_range">
             </td>
 
-            <td class="entry_notes">
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_V1">V1</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="controls_android.statistics.sharpnessMapMode">
-            <td class="entry_name"><html><body><p>android.statistics.sharpnessMapMode<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                ><html><body><p>android.statistics.sharpnessMapMode<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -9518,20 +10253,21 @@
             <td class="entry_range">
             </td>
 
-            <td class="entry_notes">
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_V1">V1</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="controls_android.statistics.lensShadingMapMode">
-            <td class="entry_name"><html><body><p>android.statistics.lensShadingMapMode<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.statistics.lensShadingMapMode<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -9559,22 +10295,28 @@
             <td class="entry_range">
             </td>
 
-            <td class="entry_notes">
+            <td class="entry_tags">
+            </td>
+
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
               <html><body><p>When set to ON,
 android.statistics.lensShadingMap must be provided in
 the output result metadata.<wbr></wbr></p></body></html>
             </td>
-
-            <td class="entry_tags">
-            </td>
-
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
         
 
       <!-- end of kind -->
       </tbody>
-      <tr><td colspan="7" class="kind">static</td></tr>
+      <tr><td colspan="6" class="kind">static</td></tr>
 
       <thead class="entries_header">
         <tr>
@@ -9583,7 +10325,6 @@
           <th class="th_description">Description</th>
           <th class="th_units">Units</th>
           <th class="th_range">Range</th>
-          <th class="th_notes">Notes</th>
           <th class="th_tags">Tags</th>
         </tr>
       </thead>
@@ -9602,7 +10343,9 @@
 
                 
           <tr class="entry" id="static_android.statistics.info.availableFaceDetectModes">
-            <td class="entry_name"><html><body><p>android.statistics.info.availableFaceDetectModes<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.statistics.info.availableFaceDetectModes<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">byte</span>
                 <span class="entry_type_container">x</span>
@@ -9631,7 +10374,15 @@
             <td class="entry_range">
             </td>
 
-            <td class="entry_notes">
+            <td class="entry_tags">
+            </td>
+
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
               <html><body><p>OFF means face detection is disabled, it must
 be included in the list.</p>
 <p>SIMPLE means the device supports the
@@ -9641,15 +10392,14 @@
 android.statistics.faceIds and
 android.statistics.faceLandmarks outputs.<wbr></wbr></p></body></html>
             </td>
-
-            <td class="entry_tags">
-            </td>
-
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.statistics.info.histogramBucketCount">
-            <td class="entry_name"><html><body><p>android.statistics.info.histogramBucketCount<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                ><html><body><p>android.statistics.info.histogramBucketCount<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
 
@@ -9670,17 +10420,17 @@
               <html><body><p>&gt;= 64<wbr></wbr></p></body></html>
             </td>
 
-            <td class="entry_notes">
-            </td>
-
             <td class="entry_tags">
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.statistics.info.maxFaceCount">
-            <td class="entry_name"><html><body><p>android.statistics.info.maxFaceCount<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                ><html><body><p>android.statistics.info.maxFaceCount<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
 
@@ -9702,17 +10452,17 @@
             modes besides OFF, otherwise 0<wbr></wbr></p></body></html>
             </td>
 
-            <td class="entry_notes">
-            </td>
-
             <td class="entry_tags">
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.statistics.info.maxHistogramCount">
-            <td class="entry_name"><html><body><p>android.statistics.info.maxHistogramCount<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                ><html><body><p>android.statistics.info.maxHistogramCount<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
 
@@ -9732,17 +10482,17 @@
             <td class="entry_range">
             </td>
 
-            <td class="entry_notes">
-            </td>
-
             <td class="entry_tags">
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.statistics.info.maxSharpnessMapValue">
-            <td class="entry_name"><html><body><p>android.statistics.info.maxSharpnessMapValue<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                ><html><body><p>android.statistics.info.maxSharpnessMapValue<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
 
@@ -9762,17 +10512,17 @@
             <td class="entry_range">
             </td>
 
-            <td class="entry_notes">
-            </td>
-
             <td class="entry_tags">
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="static_android.statistics.info.sharpnessMapSize">
-            <td class="entry_name"><html><body><p>android.statistics.info.sharpnessMapSize<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                ><html><body><p>android.statistics.info.sharpnessMapSize<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
                 <span class="entry_type_container">x</span>
@@ -9798,13 +10548,12 @@
               <html><body><p>Must be at least 32 x 32<wbr></wbr></p></body></html>
             </td>
 
-            <td class="entry_notes">
-            </td>
-
             <td class="entry_tags">
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
         
         
@@ -9813,7 +10562,7 @@
 
       <!-- end of kind -->
       </tbody>
-      <tr><td colspan="7" class="kind">dynamic</td></tr>
+      <tr><td colspan="6" class="kind">dynamic</td></tr>
 
       <thead class="entries_header">
         <tr>
@@ -9822,7 +10571,6 @@
           <th class="th_description">Description</th>
           <th class="th_units">Units</th>
           <th class="th_range">Range</th>
-          <th class="th_notes">Notes</th>
           <th class="th_tags">Tags</th>
         </tr>
       </thead>
@@ -9839,7 +10587,9 @@
 
                 
           <tr class="entry" id="dynamic_android.statistics.faceDetectMode">
-            <td class="entry_name"><html><body><p>android.statistics.faceDetectMode<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.statistics.faceDetectMode<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -9875,24 +10625,32 @@
               <html><body><p>android.statistics.info.availableFaceDetectModes<wbr></wbr></p></body></html>
             </td>
 
-            <td class="entry_notes">
-              <html><body><p>Whether face detection is enabled, and whether it
-should output just the basic fields or the full set of
-fields. Value must be one of the
-android.statistics.info.availableFaceDetectModes.<wbr></wbr></p></body></html>
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
+              <html><body><p>Whether face detection is enabled, and whether it
+should output just the basic fields or the full set of
+fields. Value must be one of the
+android.statistics.info.availableFaceDetectModes.<wbr></wbr></p></body></html>
+            </td>
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="dynamic_android.statistics.faceIds">
-            <td class="entry_name"><html><body><p>android.statistics.faceIds<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.statistics.faceIds<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
                 <span class="entry_type_container">x</span>
@@ -9916,21 +10674,29 @@
             <td class="entry_range">
             </td>
 
-            <td class="entry_notes">
-              <html><body><p>Only available if faceDetectMode == FULL<wbr></wbr></p></body></html>
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
+              <html><body><p>Only available if faceDetectMode == FULL<wbr></wbr></p></body></html>
+            </td>
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="dynamic_android.statistics.faceLandmarks">
-            <td class="entry_name"><html><body><p>android.statistics.faceLandmarks<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.statistics.faceLandmarks<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
                 <span class="entry_type_container">x</span>
@@ -9955,21 +10721,29 @@
             <td class="entry_range">
             </td>
 
-            <td class="entry_notes">
-              <html><body><p>Only available if faceDetectMode == FULL<wbr></wbr></p></body></html>
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
+              <html><body><p>Only available if faceDetectMode == FULL<wbr></wbr></p></body></html>
+            </td>
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="dynamic_android.statistics.faceRectangles">
-            <td class="entry_name"><html><body><p>android.statistics.faceRectangles<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.statistics.faceRectangles<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
                 <span class="entry_type_container">x</span>
@@ -9994,21 +10768,29 @@
             <td class="entry_range">
             </td>
 
-            <td class="entry_notes">
-              <html><body><p>Only available if faceDetectMode != OFF<wbr></wbr></p></body></html>
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
+              <html><body><p>Only available if faceDetectMode != OFF<wbr></wbr></p></body></html>
+            </td>
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="dynamic_android.statistics.faceScores">
-            <td class="entry_name"><html><body><p>android.statistics.faceScores<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.statistics.faceScores<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">byte</span>
                 <span class="entry_type_container">x</span>
@@ -10033,22 +10815,30 @@
               <html><body><p>1-100<wbr></wbr></p></body></html>
             </td>
 
-            <td class="entry_notes">
-              <html><body><p>Only available if faceDetectMode != OFF. The value should be
-meaningful (for example, setting 100 at all times is illegal).<wbr></wbr></p></body></html>
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
+              <html><body><p>Only available if faceDetectMode != OFF. The value should be
+meaningful (for example, setting 100 at all times is illegal).<wbr></wbr></p></body></html>
+            </td>
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="dynamic_android.statistics.histogram">
-            <td class="entry_name"><html><body><p>android.statistics.histogram<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.statistics.histogram<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
                 <span class="entry_type_container">x</span>
@@ -10073,24 +10863,31 @@
             <td class="entry_range">
             </td>
 
-            <td class="entry_notes">
-              <html><body><p>The k'th bucket (0-based) covers the input range
-(with w = android.sensor.info.whiteLevel) of [ k * w/N,
-(k + 1) * w / N ). If only a monochrome sharpness map is
-supported, all channels should have the same data<wbr></wbr></p></body></html>
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_V1">V1</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
+              <html><body><p>The k'th bucket (0-based) covers the input range
+(with w = android.sensor.info.whiteLevel) of [ k * w/N,
+(k + 1) * w / N ). If only a monochrome sharpness map is
+supported, all channels should have the same data<wbr></wbr></p></body></html>
+            </td>
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="dynamic_android.statistics.histogramMode">
-            <td class="entry_name"><html><body><p>android.statistics.histogramMode<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                ><html><body><p>android.statistics.histogramMode<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -10118,20 +10915,21 @@
             <td class="entry_range">
             </td>
 
-            <td class="entry_notes">
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_V1">V1</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="dynamic_android.statistics.sharpnessMap">
-            <td class="entry_name"><html><body><p>android.statistics.sharpnessMap<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.statistics.sharpnessMap<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
                 <span class="entry_type_container">x</span>
@@ -10156,22 +10954,29 @@
             <td class="entry_range">
             </td>
 
-            <td class="entry_notes">
-              <html><body><p>If only a monochrome sharpness map is supported,
-all channels should have the same data<wbr></wbr></p></body></html>
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_V1">V1</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
+              <html><body><p>If only a monochrome sharpness map is supported,
+all channels should have the same data<wbr></wbr></p></body></html>
+            </td>
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="dynamic_android.statistics.sharpnessMapMode">
-            <td class="entry_name"><html><body><p>android.statistics.sharpnessMapMode<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                ><html><body><p>android.statistics.sharpnessMapMode<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -10199,20 +11004,21 @@
             <td class="entry_range">
             </td>
 
-            <td class="entry_notes">
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_V1">V1</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="dynamic_android.statistics.lensShadingMap">
-            <td class="entry_name"><html><body><p>android.statistics.lensShadingMap<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.statistics.lensShadingMap<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">float</span>
                 <span class="entry_type_container">x</span>
@@ -10239,7 +11045,15 @@
               <html><body><p>Each gain factor is &gt;= 1<wbr></wbr></p></body></html>
             </td>
 
-            <td class="entry_notes">
+            <td class="entry_tags">
+            </td>
+
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
               <html><body><p>The least shaded section of the image should have a gain factor
 of 1; all other sections should have gains above 1.</p>
 <p>When android.colorCorrection.mode = TRANSFORM_MATRIX, the map
@@ -10278,15 +11092,15 @@
 image of a gray wall (using bicubic interpolation for visual quality) as captured by the sensor gives:</p>
 <wbr></wbr><p><img alt="Image of a uniform white wall (inverse shading map)" src="images/camera2/metadata/android.statistics.lensShadingMap/inv_shading.png"/></p></body></html>
             </td>
-
-            <td class="entry_tags">
-            </td>
-
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="dynamic_android.statistics.predictedColorGains">
-            <td class="entry_name"><html><body><p>android.statistics.predictedColorGains<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.statistics.predictedColorGains<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">float</span>
                 <span class="entry_type_container">x</span>
@@ -10311,7 +11125,15 @@
             <td class="entry_range">
             </td>
 
-            <td class="entry_notes">
+            <td class="entry_tags">
+            </td>
+
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
               <html><body><p>This may be different than the gains used for this frame,
 since statistics processing on data from a new frame
 typically completes after the transform has already been
@@ -10321,15 +11143,15 @@
 <p>This value should always be calculated by the AWB block,
 regardless of the android.control.* current values.<wbr></wbr></p></body></html>
             </td>
-
-            <td class="entry_tags">
-            </td>
-
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="dynamic_android.statistics.predictedColorTransform">
-            <td class="entry_name"><html><body><p>android.statistics.predictedColorTransform<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.statistics.predictedColorTransform<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">rational</span>
                 <span class="entry_type_container">x</span>
@@ -10355,7 +11177,15 @@
             <td class="entry_range">
             </td>
 
-            <td class="entry_notes">
+            <td class="entry_tags">
+            </td>
+
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
               <html><body><p>The HAL must provide the estimate from its
 statistics unit on the white balance transforms to use
 for the next frame. These are the values the HAL believes
@@ -10369,15 +11199,15 @@
 <p>This value should always be calculated by the AWB block,
 regardless of the android.control.* current values.<wbr></wbr></p></body></html>
             </td>
-
-            <td class="entry_tags">
-            </td>
-
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="dynamic_android.statistics.sceneFlicker">
-            <td class="entry_name"><html><body><p>android.statistics.sceneFlicker<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.statistics.sceneFlicker<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -10408,15 +11238,21 @@
             <td class="entry_range">
             </td>
 
-            <td class="entry_notes">
-              <html><body><p>Report NONE if there doesn't appear to be flickering
-illumination<wbr></wbr></p></body></html>
-            </td>
-
             <td class="entry_tags">
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
+              <html><body><p>Report NONE if there doesn't appear to be flickering
+illumination<wbr></wbr></p></body></html>
+            </td>
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
         
 
@@ -10424,10 +11260,10 @@
       </tbody>
 
   <!-- end of section -->
-  <tr><td colspan="7" id="section_tonemap" class="section">tonemap</td></tr>
+  <tr><td colspan="6" id="section_tonemap" class="section">tonemap</td></tr>
 
 
-      <tr><td colspan="7" class="kind">controls</td></tr>
+      <tr><td colspan="6" class="kind">controls</td></tr>
 
       <thead class="entries_header">
         <tr>
@@ -10436,7 +11272,6 @@
           <th class="th_description">Description</th>
           <th class="th_units">Units</th>
           <th class="th_range">Range</th>
-          <th class="th_notes">Notes</th>
           <th class="th_tags">Tags</th>
         </tr>
       </thead>
@@ -10453,7 +11288,9 @@
 
                 
           <tr class="entry" id="controls_android.tonemap.curveBlue">
-            <td class="entry_name"><html><body><p>android.tonemap.curveBlue<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.tonemap.curveBlue<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">float</span>
                 <span class="entry_type_container">x</span>
@@ -10480,20 +11317,28 @@
               <html><body><p>same as android.tonemap.curveRed<wbr></wbr></p></body></html>
             </td>
 
-            <td class="entry_notes">
+            <td class="entry_tags">
+            </td>
+
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
               <html><body><p>Tonemapping / contrast / gamma curve for the blue
 channel, to use when android.tonemap.mode is CONTRAST_CURVE.</p>
 <p>See android.tonemap.curveRed for more details.<wbr></wbr></p></body></html>
             </td>
-
-            <td class="entry_tags">
-            </td>
-
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="controls_android.tonemap.curveGreen">
-            <td class="entry_name"><html><body><p>android.tonemap.curveGreen<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.tonemap.curveGreen<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">float</span>
                 <span class="entry_type_container">x</span>
@@ -10520,20 +11365,28 @@
               <html><body><p>same as android.tonemap.curveRed<wbr></wbr></p></body></html>
             </td>
 
-            <td class="entry_notes">
+            <td class="entry_tags">
+            </td>
+
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
               <html><body><p>Tonemapping / contrast / gamma curve for the green
 channel, to use when android.tonemap.mode is CONTRAST_CURVE.</p>
 <p>See android.tonemap.curveRed for more details.<wbr></wbr></p></body></html>
             </td>
-
-            <td class="entry_tags">
-            </td>
-
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="controls_android.tonemap.curveRed">
-            <td class="entry_name"><html><body><p>android.tonemap.curveRed<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.tonemap.curveRed<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">float</span>
                 <span class="entry_type_container">x</span>
@@ -10559,7 +11412,18 @@
               <html><body><p>0-1 on input and output coordinates.<wbr></wbr></p></body></html>
             </td>
 
-            <td class="entry_notes">
+            <td class="entry_tags">
+              <ul class="entry_tags">
+                  <li><a href="#tag_DNG">DNG</a></li>
+              </ul>
+            </td>
+
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
               <html><body><p>Tonemapping / contrast / gamma curve for the red
 channel, to use when android.tonemap.mode is CONTRAST_CURVE.</p>
 <p>Since the input and output ranges may vary depending on
@@ -10573,18 +11437,14 @@
 for a few sample points would be: 0 -&gt; 0, 0.15 -&gt;
 0.25, 0.3 -&gt; 0.5, 0.5 -&gt; 0.64<wbr></wbr></p></body></html>
             </td>
-
-            <td class="entry_tags">
-              <ul class="entry_tags">
-                  <li><a href="#tag_DNG">DNG</a></li>
-              </ul>
-            </td>
-
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="controls_android.tonemap.mode">
-            <td class="entry_name"><html><body><p>android.tonemap.mode<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                ><html><body><p>android.tonemap.mode<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -10619,19 +11479,18 @@
             <td class="entry_range">
             </td>
 
-            <td class="entry_notes">
-            </td>
-
             <td class="entry_tags">
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
         
 
       <!-- end of kind -->
       </tbody>
-      <tr><td colspan="7" class="kind">static</td></tr>
+      <tr><td colspan="6" class="kind">static</td></tr>
 
       <thead class="entries_header">
         <tr>
@@ -10640,7 +11499,6 @@
           <th class="th_description">Description</th>
           <th class="th_units">Units</th>
           <th class="th_range">Range</th>
-          <th class="th_notes">Notes</th>
           <th class="th_tags">Tags</th>
         </tr>
       </thead>
@@ -10657,7 +11515,8 @@
 
                 
           <tr class="entry" id="static_android.tonemap.maxCurvePoints">
-            <td class="entry_name"><html><body><p>android.tonemap.maxCurvePoints<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                ><html><body><p>android.tonemap.maxCurvePoints<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">int32</span>
 
@@ -10678,19 +11537,18 @@
               <html><body><p>&gt;= 128<wbr></wbr></p></body></html>
             </td>
 
-            <td class="entry_notes">
-            </td>
-
             <td class="entry_tags">
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
         
 
       <!-- end of kind -->
       </tbody>
-      <tr><td colspan="7" class="kind">dynamic</td></tr>
+      <tr><td colspan="6" class="kind">dynamic</td></tr>
 
       <thead class="entries_header">
         <tr>
@@ -10699,7 +11557,6 @@
           <th class="th_description">Description</th>
           <th class="th_units">Units</th>
           <th class="th_range">Range</th>
-          <th class="th_notes">Notes</th>
           <th class="th_tags">Tags</th>
         </tr>
       </thead>
@@ -10716,7 +11573,9 @@
 
                 
           <tr class="entry" id="dynamic_android.tonemap.curveBlue">
-            <td class="entry_name"><html><body><p>android.tonemap.curveBlue<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.tonemap.curveBlue<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">float</span>
                 <span class="entry_type_container">x</span>
@@ -10743,20 +11602,28 @@
               <html><body><p>same as android.tonemap.curveRed<wbr></wbr></p></body></html>
             </td>
 
-            <td class="entry_notes">
+            <td class="entry_tags">
+            </td>
+
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
               <html><body><p>Tonemapping / contrast / gamma curve for the blue
 channel, to use when android.tonemap.mode is CONTRAST_CURVE.</p>
 <p>See android.tonemap.curveRed for more details.<wbr></wbr></p></body></html>
             </td>
-
-            <td class="entry_tags">
-            </td>
-
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="dynamic_android.tonemap.curveGreen">
-            <td class="entry_name"><html><body><p>android.tonemap.curveGreen<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.tonemap.curveGreen<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">float</span>
                 <span class="entry_type_container">x</span>
@@ -10783,20 +11650,28 @@
               <html><body><p>same as android.tonemap.curveRed<wbr></wbr></p></body></html>
             </td>
 
-            <td class="entry_notes">
+            <td class="entry_tags">
+            </td>
+
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
               <html><body><p>Tonemapping / contrast / gamma curve for the green
 channel, to use when android.tonemap.mode is CONTRAST_CURVE.</p>
 <p>See android.tonemap.curveRed for more details.<wbr></wbr></p></body></html>
             </td>
-
-            <td class="entry_tags">
-            </td>
-
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="dynamic_android.tonemap.curveRed">
-            <td class="entry_name"><html><body><p>android.tonemap.curveRed<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.tonemap.curveRed<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name">float</span>
                 <span class="entry_type_container">x</span>
@@ -10822,7 +11697,18 @@
               <html><body><p>0-1 on input and output coordinates.<wbr></wbr></p></body></html>
             </td>
 
-            <td class="entry_notes">
+            <td class="entry_tags">
+              <ul class="entry_tags">
+                  <li><a href="#tag_DNG">DNG</a></li>
+              </ul>
+            </td>
+
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
               <html><body><p>Tonemapping / contrast / gamma curve for the red
 channel, to use when android.tonemap.mode is CONTRAST_CURVE.</p>
 <p>Since the input and output ranges may vary depending on
@@ -10836,18 +11722,14 @@
 for a few sample points would be: 0 -&gt; 0, 0.15 -&gt;
 0.25, 0.3 -&gt; 0.5, 0.5 -&gt; 0.64<wbr></wbr></p></body></html>
             </td>
-
-            <td class="entry_tags">
-              <ul class="entry_tags">
-                  <li><a href="#tag_DNG">DNG</a></li>
-              </ul>
-            </td>
-
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
                 
           <tr class="entry" id="dynamic_android.tonemap.mode">
-            <td class="entry_name"><html><body><p>android.tonemap.mode<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                ><html><body><p>android.tonemap.mode<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -10882,13 +11764,12 @@
             <td class="entry_range">
             </td>
 
-            <td class="entry_notes">
-            </td>
-
             <td class="entry_tags">
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
         
 
@@ -10896,10 +11777,10 @@
       </tbody>
 
   <!-- end of section -->
-  <tr><td colspan="7" id="section_led" class="section">led</td></tr>
+  <tr><td colspan="6" id="section_led" class="section">led</td></tr>
 
 
-      <tr><td colspan="7" class="kind">controls</td></tr>
+      <tr><td colspan="6" class="kind">controls</td></tr>
 
       <thead class="entries_header">
         <tr>
@@ -10908,7 +11789,6 @@
           <th class="th_description">Description</th>
           <th class="th_units">Units</th>
           <th class="th_range">Range</th>
-          <th class="th_notes">Notes</th>
           <th class="th_tags">Tags</th>
         </tr>
       </thead>
@@ -10925,7 +11805,8 @@
 
                 
           <tr class="entry" id="controls_android.led.transmit">
-            <td class="entry_name"><html><body><p>android.led.transmit<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                ><html><body><p>android.led.transmit<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -10961,19 +11842,18 @@
             <td class="entry_range">
             </td>
 
-            <td class="entry_notes">
-            </td>
-
             <td class="entry_tags">
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
         
 
       <!-- end of kind -->
       </tbody>
-      <tr><td colspan="7" class="kind">dynamic</td></tr>
+      <tr><td colspan="6" class="kind">dynamic</td></tr>
 
       <thead class="entries_header">
         <tr>
@@ -10982,7 +11862,6 @@
           <th class="th_description">Description</th>
           <th class="th_units">Units</th>
           <th class="th_range">Range</th>
-          <th class="th_notes">Notes</th>
           <th class="th_tags">Tags</th>
         </tr>
       </thead>
@@ -10999,7 +11878,8 @@
 
                 
           <tr class="entry" id="dynamic_android.led.transmit">
-            <td class="entry_name"><html><body><p>android.led.transmit<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                ><html><body><p>android.led.transmit<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -11035,19 +11915,18 @@
             <td class="entry_range">
             </td>
 
-            <td class="entry_notes">
-            </td>
-
             <td class="entry_tags">
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
         
 
       <!-- end of kind -->
       </tbody>
-      <tr><td colspan="7" class="kind">static</td></tr>
+      <tr><td colspan="6" class="kind">static</td></tr>
 
       <thead class="entries_header">
         <tr>
@@ -11056,7 +11935,6 @@
           <th class="th_description">Description</th>
           <th class="th_units">Units</th>
           <th class="th_range">Range</th>
-          <th class="th_notes">Notes</th>
           <th class="th_tags">Tags</th>
         </tr>
       </thead>
@@ -11073,7 +11951,8 @@
 
                 
           <tr class="entry" id="static_android.led.availableLeds">
-            <td class="entry_name"><html><body><p>android.led.availableLeds<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                ><html><body><p>android.led.availableLeds<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
                 <span class="entry_type_container">x</span>
@@ -11102,13 +11981,12 @@
             <td class="entry_range">
             </td>
 
-            <td class="entry_notes">
-            </td>
-
             <td class="entry_tags">
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
         
 
@@ -11116,10 +11994,10 @@
       </tbody>
 
   <!-- end of section -->
-  <tr><td colspan="7" id="section_info" class="section">info</td></tr>
+  <tr><td colspan="6" id="section_info" class="section">info</td></tr>
 
 
-      <tr><td colspan="7" class="kind">static</td></tr>
+      <tr><td colspan="6" class="kind">static</td></tr>
 
       <thead class="entries_header">
         <tr>
@@ -11128,7 +12006,6 @@
           <th class="th_description">Description</th>
           <th class="th_units">Units</th>
           <th class="th_range">Range</th>
-          <th class="th_notes">Notes</th>
           <th class="th_tags">Tags</th>
         </tr>
       </thead>
@@ -11145,7 +12022,8 @@
 
                 
           <tr class="entry" id="static_android.info.supportedHardwareLevel">
-            <td class="entry_name"><html><body><p>android.info.supportedHardwareLevel<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                ><html><body><p>android.info.supportedHardwareLevel<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -11180,13 +12058,12 @@
               <html><body><p>Optional. Default value is LIMITED.<wbr></wbr></p></body></html>
             </td>
 
-            <td class="entry_notes">
-            </td>
-
             <td class="entry_tags">
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
         
 
@@ -11194,10 +12071,10 @@
       </tbody>
 
   <!-- end of section -->
-  <tr><td colspan="7" id="section_blackLevel" class="section">blackLevel</td></tr>
+  <tr><td colspan="6" id="section_blackLevel" class="section">blackLevel</td></tr>
 
 
-      <tr><td colspan="7" class="kind">controls</td></tr>
+      <tr><td colspan="6" class="kind">controls</td></tr>
 
       <thead class="entries_header">
         <tr>
@@ -11206,7 +12083,6 @@
           <th class="th_description">Description</th>
           <th class="th_units">Units</th>
           <th class="th_range">Range</th>
-          <th class="th_notes">Notes</th>
           <th class="th_tags">Tags</th>
         </tr>
       </thead>
@@ -11223,7 +12099,9 @@
 
                 
           <tr class="entry" id="controls_android.blackLevel.lock">
-            <td class="entry_name"><html><body><p>android.blackLevel.lock<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.blackLevel.lock<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -11251,7 +12129,18 @@
             <td class="entry_range">
             </td>
 
-            <td class="entry_notes">
+            <td class="entry_tags">
+              <ul class="entry_tags">
+                  <li><a href="#tag_HAL2">HAL2</a></li>
+              </ul>
+            </td>
+
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
               <html><body><p>When set to ON, the values used for black-level
 compensation must not change until the lock is set to
 OFF</p>
@@ -11289,20 +12178,15 @@
 must report 'OFF' when this does happen) until the next time locking
 is legal again.<wbr></wbr></p></body></html>
             </td>
-
-            <td class="entry_tags">
-              <ul class="entry_tags">
-                  <li><a href="#tag_HAL2">HAL2</a></li>
-              </ul>
-            </td>
-
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
         
         
 
       <!-- end of kind -->
       </tbody>
-      <tr><td colspan="7" class="kind">dynamic</td></tr>
+      <tr><td colspan="6" class="kind">dynamic</td></tr>
 
       <thead class="entries_header">
         <tr>
@@ -11311,7 +12195,6 @@
           <th class="th_description">Description</th>
           <th class="th_units">Units</th>
           <th class="th_range">Range</th>
-          <th class="th_notes">Notes</th>
           <th class="th_tags">Tags</th>
         </tr>
       </thead>
@@ -11328,7 +12211,9 @@
 
                 
           <tr class="entry" id="dynamic_android.blackLevel.lock">
-            <td class="entry_name"><html><body><p>android.blackLevel.lock<wbr></wbr></p></body></html></td>
+            <td class="entry_name"
+                  rowspan="3"
+                ><html><body><p>android.blackLevel.lock<wbr></wbr></p></body></html></td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
 
@@ -11356,19 +12241,25 @@
             <td class="entry_range">
             </td>
 
-            <td class="entry_notes">
-              <html><body><p>Whether the black level offset was locked for this frame.
-Should be ON if android.blackLevel.lock was ON in the capture request,
-unless a change in capture settings forced a black level reset.<wbr></wbr></p></body></html>
-            </td>
-
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_HAL2">HAL2</a></li>
               </ul>
             </td>
 
-          </tr> <!-- end of entry -->
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
+              <html><body><p>Whether the black level offset was locked for this frame.
+Should be ON if android.blackLevel.lock was ON in the capture request,
+unless a change in capture settings forced a black level reset.<wbr></wbr></p></body></html>
+            </td>
+          </tr>
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->