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

* commit 'cc6e41a44524592c9b477f99fcc738dea7538811':
  Restore CAMERA permission to ApiDemos.
This commit is contained in:
Daniel Sandler
2011-03-04 11:38:27 -08:00
committed by Android Git Automerger

View File

@@ -40,11 +40,9 @@
<!-- We will request access to the camera, saying we require a camera
of some sort but not one with autofocus capability. -->
<!--
<uses-permission android:name="android.permission.CAMERA" />
<uses-feature android:name="android.hardware.camera" />
<uses-feature android:name="android.hardware.camera.autofocus" android:required="false" />
-->
<application android:name="ApiDemosApplication"
android:label="@string/activity_sample_code"