commit c6b657906eb9fd4b96ae5edb84708c201963499a
author The Android Automerger <android-build@google.com> Sun Sep 28 06:18:11 2014 -0700
committer The Android Automerger <android-build@google.com> Sun Sep 28 06:18:11 2014 -0700
tree 3467a1dd133f2793f142c301a02d6a61b428598e
parent d77b234a57985f421c32749f821c035f1a2af004
parent 4f07a11ad8b10879d37d4204788120660245f4e9

merge in lmp-release history after reset to d77b234a57985f421c32749f821c035f1a2af004

camera/docs/docs.html

diff --git a/camera/docs/docs.html b/camera/docs/docs.html
index 773c466..1addcdc 100644
--- a/camera/docs/docs.html
+++ b/camera/docs/docs.html
@@ -3114,8 +3114,7 @@
 image while recording video) use case.<wbr/></p>
 <p>The camera device should take the highest-quality image
 possible (given the other settings) without disrupting the
-frame rate of video recording.<wbr/><br/>
-</p></span>
+frame rate of video recording.<wbr/>  </p></span>
                   </li>
                   <li>
                     <span class="entry_type_enum_name">ZERO_SHUTTER_LAG</span>
@@ -6784,8 +6783,7 @@
 image while recording video) use case.<wbr/></p>
 <p>The camera device should take the highest-quality image
 possible (given the other settings) without disrupting the
-frame rate of video recording.<wbr/><br/>
-</p></span>
+frame rate of video recording.<wbr/>  </p></span>
                   </li>
                   <li>
                     <span class="entry_type_enum_name">ZERO_SHUTTER_LAG</span>
@@ -15955,7 +15953,7 @@
             </td>
 
             <td class="entry_range">
-              <p>Min &lt;= 100,<wbr/> Max &gt;= 1600</p>
+              <p>Min &lt;= 100,<wbr/> Max &gt;= 800</p>
             </td>
 
             <td class="entry_tags">

camera/docs/metadata_properties.xml

diff --git a/camera/docs/metadata_properties.xml b/camera/docs/metadata_properties.xml
index 29260e8..8e8a757 100644
--- a/camera/docs/metadata_properties.xml
+++ b/camera/docs/metadata_properties.xml
@@ -4722,7 +4722,7 @@
               <size>2</size>
             </array>
             <description>Range of valid sensitivities.</description>
-            <range>Min &lt;= 100, Max &amp;gt;= 1600</range>
+            <range>Min &lt;= 100, Max &amp;gt;= 800</range>
             <details>
               The minimum and maximum valid values for the
               android.sensor.sensitivity control.