tree 0eea8c5963e03d35f60c1df623e818d40963952b
parent 4d441e8e52b2b191bd1353cadf95d689fb9c94c1
parent 26105cad7ce5cc01cd77200068ded072a9b63824
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.