commit affd0f8ec31f9bf1f0f2288c5f6ebab9c18673fe
author Roman Nurik <romannurik@google.com> Mon Oct 25 13:55:34 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Oct 25 13:55:34 2010 -0700
tree bd893c9d6bbc2f586a1eb6b2688f621f53a15287
parent ccbd8955c0ce6c0bef32d531b6d8c607db7fb561
parent 83c50ca740fabe25189601db90dc1f65ed4d2061

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 '83c50ca740fabe25189601db90dc1f65ed4d2061' into gingerbread-plus-aosp

* commit '83c50ca740fabe25189601db90dc1f65ed4d2061':
  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.