summaryrefslogtreecommitdiffstats
path: root/AndroidManifest.xml
diff options
context:
space:
mode:
authorYour Name <jreck@google.com>2012-12-03 16:15:37 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-12-03 16:15:37 -0800
commit73cc3ca5cf1ff4f9a37dba170999bbfd507616eb (patch)
tree758c7dd8421ca19481f0ac2d093c5582d2b97bc8 /AndroidManifest.xml
parent2e21360434f5a455cb6a6f430e37fd096c870a38 (diff)
parent825a5258957160fd0fe3d425e323d22b254dcdb1 (diff)
downloadandroid_packages_apps_Snap-73cc3ca5cf1ff4f9a37dba170999bbfd507616eb.tar.gz
android_packages_apps_Snap-73cc3ca5cf1ff4f9a37dba170999bbfd507616eb.tar.bz2
android_packages_apps_Snap-73cc3ca5cf1ff4f9a37dba170999bbfd507616eb.zip
am 04df59eb: Merge "Change themes" into gb-ub-photos-arches
* commit '04df59eb082189500d360fffb95ef541073d6fe6': Change themes
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 25fe9dd9b..cd8a726e7 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -398,7 +398,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>