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.
tree: ebfd8bac504962a8ee7cd541a823723b09981868
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/