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