tree 719aa1f72beb477bd8e4b4222010d19129edd82e
parent ca84caeed8c990e9b81f7d43b6f0202549665496
parent 12bbe5d7d47747c093ddac2977f594a4a3c1810e
author James Dong <jdong@google.com> 1316553230 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1316553230 -0700

am 3907c79a: am 92d0a64b: Merge "Add QVGA resolution to CamcorderProfile" into ics-factoryrom

* commit '3907c79aebf8621a5a4880c9e66db3c49a44f359':
  Add QVGA resolution to CamcorderProfile