am 9bf511db: am f73d48d7: Merge "Fix some camera orientation javadoc errors." into gingerbread

Merge commit '9bf511db85db8e8eff8833b3ec2c30cef12f9188'

* commit '9bf511db85db8e8eff8833b3ec2c30cef12f9188':
  Fix some camera orientation javadoc errors.