tree c3437f83f2f82135c7fe377a95f18450ce88d737
parent 98449546fa33f420e2aef7d0d1c1afb538af4069
parent 7017e0d5c372db1e470d9881c46b15eade051d76
author Dan Tasse <dantasse@google.com> 1278561347 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1278561347 -0700

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

Merge commit '7017e0d5c372db1e470d9881c46b15eade051d76'

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