commit 2ffc283435748b134c32efb14db54b5393eb51c8
author The Android Automerger <android-build@google.com> Thu May 23 05:55:23 2013 -0700
committer The Android Automerger <android-build@google.com> Thu May 23 05:55:23 2013 -0700
tree 1568c8e77a9e2f833da6e83e7927ddea0110e1dc
parent 73dba5e043d44910a8cee4def742f58607fc5894
parent abd5bc665419459b5967690c792ec6e4a074e779

merge in jb-mr2-release history after reset to jb-mr2-dev

include/hardware/camera3.h

diff --git a/include/hardware/camera3.h b/include/hardware/camera3.h
index af91856..3a900fc 100644
--- a/include/hardware/camera3.h
+++ b/include/hardware/camera3.h
@@ -723,6 +723,12 @@
  *| CONVERGED          | AE/AWB_LOCK   | LOCKED             | values locked    |
  *|                    | on            |                    |                  |
  *+--------------------+---------------+--------------------+------------------+
+ *| FLASH_REQUIRED     | HAL initiates | SEARCHING          | values locked    |
+ *|                    | AE/AWB scan   |                    |                  |
+ *+--------------------+---------------+--------------------+------------------+
+ *| FLASH_REQUIRED     | AE/AWB_LOCK   | LOCKED             | values locked    |
+ *|                    | on            |                    |                  |
+ *+--------------------+---------------+--------------------+------------------+
  *| LOCKED             | AE/AWB_LOCK   | SEARCHING          | values not good  |
  *|                    | off           |                    | after unlock     |
  *+--------------------+---------------+--------------------+------------------+