am 4db458b4: am a6f41495: Merge "Update camera API and javadoc for API review comments." into gingerbread

Merge commit '4db458b4f71cd9ccbb98f5bf2c08e1f0eb750548'

* commit '4db458b4f71cd9ccbb98f5bf2c08e1f0eb750548':
  Update camera API and javadoc for API review comments.