Merge commit 'f3f25bf80b7d21f12442da8f82d17c79dd371692' into gingerbread-plus-aosp * commit 'f3f25bf80b7d21f12442da8f82d17c79dd371692': Added some javadoc to Camera.takePicture()
Merge commit 'f3f25bf80b7d21f12442da8f82d17c79dd371692' into gingerbread-plus-aosp * commit 'f3f25bf80b7d21f12442da8f82d17c79dd371692': Added some javadoc to Camera.takePicture()