tree 719aa1f72beb477bd8e4b4222010d19129edd82e
parent cba4873fa3bc325235b6b9de6ebe9721a8a25a14
parent ad8e8bfea2da077248a9f217c029e14fefb01096
author The Android Open Source Project <initial-contribution@android.com> 1316553281 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1316553281 -0700

am 3617cb65: Reconcile with ics-factoryrom-release

* commit '3617cb652158c136b4b79f0e69d905794fc12843':
  Add QVGA resolution to CamcorderProfile
  Add PROPERTY_IMS_REG_REQUIRED.