tree 2c50fbe64a1624cc4805f70072285126c3a0d584
parent cab133a7fa39969f136e3f401f97f6ce843514bb
parent ccc17b34fe6f0a6cc4ca86f28663fcf28827d2d4
author James Dong <jdong@google.com> 1270143611 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1270143611 -0700

am ccc17b34: Merge "Public API changes for CameraProfile and CamcorderProfile classes" into froyo

Merge commit 'ccc17b34fe6f0a6cc4ca86f28663fcf28827d2d4' into froyo-plus-aosp

* commit 'ccc17b34fe6f0a6cc4ca86f28663fcf28827d2d4':
  Public API changes for CameraProfile and CamcorderProfile classes