am 3d9a9e55: Merge "Update camera javadoc about AE and AWB lock." into ics-factoryrom

* commit '3d9a9e55df85c720573e69ec3062efc331ea69bb':
  Update camera javadoc about AE and AWB lock.
tree: 9a1f16368db040e63102136b1632b8261e66864f
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/