summaryrefslogtreecommitdiffstats
path: root/AndroidManifest.xml
diff options
context:
space:
mode:
authorDanielle Millett <dmillett@google.com>2012-11-30 18:26:58 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-11-30 18:26:58 -0800
commit495626818d5fcba9c7e15c23788a55e456116260 (patch)
tree0411baad453e57a76a84245af742d3b1d4f196c9 /AndroidManifest.xml
parent5e337eda4ff40673e1498603134b6731b8e50da1 (diff)
parent12c1451f1fbcbc8b2b0dbf68886b6742e8eb83e2 (diff)
downloadpackages_apps_settings-495626818d5fcba9c7e15c23788a55e456116260.zip
packages_apps_settings-495626818d5fcba9c7e15c23788a55e456116260.tar.gz
packages_apps_settings-495626818d5fcba9c7e15c23788a55e456116260.tar.bz2
Merge "Removing tutorial for choosing a pattern as part of b/7459863" into jb-mr1.1-dev
Diffstat (limited to 'AndroidManifest.xml')
-rw-r--r--AndroidManifest.xml2
1 files changed, 0 insertions, 2 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index df53863..14207db 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -961,8 +961,6 @@
<activity android:name="ChooseLockPassword" android:exported="false"
android:windowSoftInputMode="stateVisible|adjustResize"/>
- <activity android:name="ChooseLockPatternTutorial" android:exported="false"/>
-
<!-- Runs in the phone process since it needs access to the Phone object -->
<activity android:name=".deviceinfo.Status"
android:label="@string/device_status_activity_title"