am 7017e0d5: am f3f25bf8: Added some javadoc to Camera.takePicture()

Merge commit '7017e0d5c372db1e470d9881c46b15eade051d76'

* commit '7017e0d5c372db1e470d9881c46b15eade051d76':
  Added some javadoc to Camera.takePicture()