tree 8e1ef71a3fdf5ddde9480bdabc60f554b3a01716
parent b408f5490b8591a2799d6b1db91e29e4b203d2bf
parent ccaa002848e9ef1ff232eee5babc9273599924af
author Wu-cheng Li <wuchengli@google.com> 1281647156 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1281647156 -0700

am ccaa0028: Merge "Improve camera documentation." into gingerbread

Merge commit 'ccaa002848e9ef1ff232eee5babc9273599924af' into gingerbread-plus-aosp

* commit 'ccaa002848e9ef1ff232eee5babc9273599924af':
  Improve camera documentation.