tree ebfd8bac504962a8ee7cd541a823723b09981868
parent 8190975e03954b2efe30bd2cd146d869ad676580
parent 8031ec79eb657a0ae84325410578ea87f50eeb54
author James Dong <jdong@google.com> 1300313463 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1300313463 -0700

am fc591762: Merge "Add the default camera id to mCameraIds for emulator and those devices without media_profiles.xml configuration file." into honeycomb-mr1

* commit 'fc59176241f498ad4eeb4237800c2eb5edd9efcd':
  Add the default camera id to mCameraIds for emulator and those devices without media_profiles.xml configuration file.