am 7a3ba4d7: am 514a6cfb: Merge "Improve camera javadoc and fix some errors." into ics-mr0

* commit '7a3ba4d732d5ce394aab9783e4099b2e71f1903f':
  Improve camera javadoc and fix some errors.