commit f6ab64affe8cbd1ab8c163635faa557be58a207a
author Daniel Sandler <dsandler@google.com> Fri Mar 04 10:42:15 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 04 10:42:15 2011 -0800
tree 3c5c7ea446d81bcf76610caf3307bd51d0728f0e
parent af3c92d5016bd43c88d0a70d6f43ec7573ec1087
parent 6044514d0ded7c548e1cf6927c77565b4f2298e7

Merge "Restore CAMERA permission to ApiDemos." into honeycomb-mr1

samples/ApiDemos/AndroidManifest.xml

diff --git a/samples/ApiDemos/AndroidManifest.xml b/samples/ApiDemos/AndroidManifest.xml
index c6e03b6..c3d66df 100644
--- a/samples/ApiDemos/AndroidManifest.xml
+++ b/samples/ApiDemos/AndroidManifest.xml
@@ -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"