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
commit04df59eb082189500d360fffb95ef541073d6fe6 (patch)
tree5637a60ea2d20373e10e71aa959ddde74c6fc03a /AndroidManifest.xml
parent599393ecad6803161d5e901ef625e34cfe088009 (diff)
parentd10468b65396dd1fa4f20006fa8cea1221cc613c (diff)
downloadandroid_packages_apps_Gallery2-04df59eb082189500d360fffb95ef541073d6fe6.tar.gz
android_packages_apps_Gallery2-04df59eb082189500d360fffb95ef541073d6fe6.tar.bz2
android_packages_apps_Gallery2-04df59eb082189500d360fffb95ef541073d6fe6.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>