tree 13bbdc0fb984a32a1084a68e919e4fbb36063ce7
parent e4ef29f1ca222c7712bef9299817a33aa63cb0f1
parent 906d4c565fe1c8098df2093c79acc02f5b92814a
author Wu-cheng Li <wuchengli@google.com> 1282241444 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1282241444 -0700

am eba12749: Merge "Adding getSupportedPreviewSizes to CameraParameters.DO NOT MERGE" into gingerbread

Merge commit 'eba1274978911ea188eead128645299669d02f60' into gingerbread-plus-aosp

* commit 'eba1274978911ea188eead128645299669d02f60':
  Adding getSupportedPreviewSizes to CameraParameters.DO NOT MERGE