summaryrefslogtreecommitdiffstats
path: root/AndroidManifest.xml
diff options
context:
space:
mode:
authorYour Name <jreck@google.com>2012-12-03 16:14:03 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-12-03 16:14:03 -0800
commit825a5258957160fd0fe3d425e323d22b254dcdb1 (patch)
tree35f80be69a61066ef35c59d895733530d7d2dde0 /AndroidManifest.xml
parenta2220fad53bcda9da99e6ad5c788eac3126459cb (diff)
parent359fe243f57d1e84c629f219891e8c1aa07cdd20 (diff)
downloadandroid_packages_apps_Snap-825a5258957160fd0fe3d425e323d22b254dcdb1.tar.gz
android_packages_apps_Snap-825a5258957160fd0fe3d425e323d22b254dcdb1.tar.bz2
android_packages_apps_Snap-825a5258957160fd0fe3d425e323d22b254dcdb1.zip
Merge "Change themes" into gb-ub-photos-arches
Diffstat (limited to 'AndroidManifest.xml')
-rw-r--r--AndroidManifest.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 0ef4fba34..e6c6e2e7e 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -394,7 +394,7 @@
</intent-filter>
</activity>
<activity android:name="com.android.camera.ProxyLauncher"
- android:theme="@android:style/Theme.NoDisplay">
+ android:theme="@style/Theme.ProxyLauncher">
</activity>
</application>
</manifest>