commit a10cf9edd8841db2040344683b7b7873f27ea2e6
author Roman Nurik <romannurik@google.com> Mon Oct 25 14:00:28 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Oct 25 14:00:28 2010 -0700
tree 591c7982a660f60892f6527288033f9148b1a4ff
parent bfb2c1dbd09280426a0b57856b319e80d58b5864
parent affd0f8ec31f9bf1f0f2288c5f6ebab9c18673fe

am affd0f8e: am 83c50ca7: Merge "Update ApiDemos CameraPreview activity to properly center the preview in cases where the camera hardware doesn\'t support a preview size with the same aspect ratio as the device display." into gingerbread

Merge commit 'affd0f8ec31f9bf1f0f2288c5f6ebab9c18673fe'

* commit 'affd0f8ec31f9bf1f0f2288c5f6ebab9c18673fe':
  Update ApiDemos CameraPreview activity to properly center the preview in cases where the camera hardware doesn't support a preview size with the same aspect ratio as the device display.