Merge "Update camera javadoc about AE and AWB lock." into ics-factoryrom
tree: d44f557cc6a511900df865aa0ebd8de877b8e086
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/