diff options
| author | Fabrice Di Meglio <fdimeglio@google.com> | 2014-07-24 21:22:06 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-07-24 15:36:02 +0000 |
| commit | 6cef9d23b8572d8bd87329999f10286e29a861c0 (patch) | |
| tree | 53d366cc4d05d7b9b4efcd883f7e08526e967e79 /src/com/android/settings/Settings.java | |
| parent | 468d39160fd417cf23cba3d592acb349d3f59c55 (diff) | |
| parent | e3ff4d8e92a19473c622c1d46b30c63bf2d001d0 (diff) | |
| download | packages_apps_Settings-6cef9d23b8572d8bd87329999f10286e29a861c0.zip packages_apps_Settings-6cef9d23b8572d8bd87329999f10286e29a861c0.tar.gz packages_apps_Settings-6cef9d23b8572d8bd87329999f10286e29a861c0.tar.bz2 | |
Merge "Fix bug #16515550 Settings app crashes for intent com.android.settings.QUICK_LAUNCH_SETTINGS" into lmp-dev
Diffstat (limited to 'src/com/android/settings/Settings.java')
| -rw-r--r-- | src/com/android/settings/Settings.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java index fcaa7ae..177bcf8 100644 --- a/src/com/android/settings/Settings.java +++ b/src/com/android/settings/Settings.java @@ -94,6 +94,7 @@ public class Settings extends SettingsActivity { public static class NotificationSettingsActivity extends SettingsActivity { /* empty */ } public static class AppNotificationSettingsActivity extends SettingsActivity { /* empty */ } public static class OtherSoundSettingsActivity extends SettingsActivity { /* empty */ } + public static class QuickLaunchSettingsActivity extends SettingsActivity { /* empty */ } public static class TopLevelSettings extends SettingsActivity { /* empty */ } } |