am cc6e41a4: am f6ab64af: Merge "Restore CAMERA permission to ApiDemos." into honeycomb-mr1

* commit 'cc6e41a44524592c9b477f99fcc738dea7538811':
  Restore CAMERA permission to ApiDemos.