summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMangesh Ghiware <mghiware@google.com>2013-08-22 16:13:33 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-08-22 16:13:33 -0700
commit5fc3a705aa69b477af367db33d10ef65ed68d0db (patch)
treeef1b102b5cbc14601f3f75a0bab9f2d99ff3200a
parent826fa6da8e2a7157db2ff624c5aa58fbf82b2877 (diff)
parent68625f46ad654a797e944a57d1c896585ffbd3a9 (diff)
downloadandroid_packages_apps_Gallery2-5fc3a705aa69b477af367db33d10ef65ed68d0db.tar.gz
android_packages_apps_Gallery2-5fc3a705aa69b477af367db33d10ef65ed68d0db.tar.bz2
android_packages_apps_Gallery2-5fc3a705aa69b477af367db33d10ef65ed68d0db.zip
am 68625f46: am f41385b0: am 73d0f429: Add label to CameraLauncher activity-alias.
* commit '68625f46ad654a797e944a57d1c896585ffbd3a9': Add label to CameraLauncher activity-alias.
-rw-r--r--AndroidManifest.xml1
1 files changed, 1 insertions, 0 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index b7a1c4e93..c2f93f3ea 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -179,6 +179,7 @@
android:label="@string/camera_label"
android:theme="@style/android:Theme.NoDisplay" />
<activity-alias android:name="com.android.camera.CameraLauncher"
+ android:label="@string/camera_label"
android:targetActivity="com.android.camera.CameraActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />