commit e4e721b9a0782ab9f8ca455ad53c9c1e4ae01144
author The Android Automerger <android-build@google.com> Tue Sep 23 06:21:09 2014 -0700
committer The Android Automerger <android-build@google.com> Tue Sep 23 06:21:09 2014 -0700
tree b792e5a28bd0e78c245b45fbf21567834ebbc737
parent a5bcb401f154ddf05017ee13d6ae7e4774fd3107
parent 508ae6cb809744c237159246fa925ab3510caf81

merge in lmp-release history after reset to a5bcb401f154ddf05017ee13d6ae7e4774fd3107

camera/docs/docs.html

diff --git a/camera/docs/docs.html b/camera/docs/docs.html
index 1ff34ae..773c466 100644
--- a/camera/docs/docs.html
+++ b/camera/docs/docs.html
@@ -4034,9 +4034,9 @@
               <p>Not all the auto-focus modes may be supported by a
 given camera device.<wbr/> This entry lists the valid modes for
 <a href="#controls_android.control.afMode">android.<wbr/>control.<wbr/>af<wbr/>Mode</a> for this camera device.<wbr/></p>
-<p>All camera devices will support OFF mode,<wbr/> and all camera devices with
-adjustable focuser units (<code><a href="#static_android.lens.info.minimumFocusDistance">android.<wbr/>lens.<wbr/>info.<wbr/>minimum<wbr/>Focus<wbr/>Distance</a> &gt; 0</code>)
-will support AUTO mode.<wbr/></p>
+<p>All LIMITED and FULL mode camera devices will support OFF mode,<wbr/> and all
+camera devices with adjustable focuser units
+(<code><a href="#static_android.lens.info.minimumFocusDistance">android.<wbr/>lens.<wbr/>info.<wbr/>minimum<wbr/>Focus<wbr/>Distance</a> &gt; 0</code>) will support AUTO mode.<wbr/></p>
             </td>
           </tr>
 

camera/docs/metadata_properties.xml

diff --git a/camera/docs/metadata_properties.xml b/camera/docs/metadata_properties.xml
index 9ef6091..29260e8 100644
--- a/camera/docs/metadata_properties.xml
+++ b/camera/docs/metadata_properties.xml
@@ -1615,9 +1615,9 @@
           given camera device. This entry lists the valid modes for
           android.control.afMode for this camera device.
 
-          All camera devices will support OFF mode, and all camera devices with
-          adjustable focuser units (`android.lens.info.minimumFocusDistance > 0`)
-          will support AUTO mode.
+          All LIMITED and FULL mode camera devices will support OFF mode, and all
+          camera devices with adjustable focuser units
+          (`android.lens.info.minimumFocusDistance > 0`) will support AUTO mode.
           </details>
           <tag id="BC" />
         </entry>