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

Merge commit 'a6f41495962c6427cfb3976daeb7f7b4df63ac57' into gingerbread-plus-aosp

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