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

* commit '514a6cfb7f7085b266f457155ff63373d2dff8ee':
  Improve camera javadoc and fix some errors.