commit 2f0dd19aedd17991842cfd01b0f09ef9d208bdee
author Dmitri Plotnikov <dplotnikov@google.com> Thu Jan 27 10:47:10 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jan 27 10:47:10 2011 -0800
tree c4e16868dddbc7a3afad288d6c017452c5171ac5
parent 475edbca79486a5734fbe37930fd704b9d8294b5
parent aa408e086ac013cd822c4f6b5f4ad91ae442d02f

Merge "Transferring display name logic to GAL provider" into honeycomb

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 998c911..8c61e22 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -82,6 +82,8 @@
     <uses-permission
         android:name="com.android.email.permission.ACCESS_PROVIDER"/>
 
+    <!-- Note:  Actually, android:hardwareAccelerated could be "true", but in order to switch it
+         on/off in the debug screen, we have to set it "false" here and enable it at runtime.  -->
     <application
         android:icon="@mipmap/icon"
         android:label="@string/app_name"
@@ -89,7 +91,6 @@
         android:theme="@android:style/Theme.Holo.Light"
         android:hardwareAccelerated="false"
         >
-        <!-- STOPSHIP android:hardwareAccelerated should be "true" -->
         <activity
             android:name=".activity.Welcome"
             >