From 33acb15e032ac65d743b708731004b9a5f7813d5 Mon Sep 17 00:00:00 2001
From: Narayan Kamath <narayan@google.com>
Date: Mon, 16 Mar 2015 12:48:05 +0000
Subject: [PATCH] Fix Settings build.

Broken due to a bogus merge conflict resolution.

Change-Id: Id4e3215ac964ebac792e29f50741b020c06d11f4
---
 src/com/android/settings/SettingsActivity.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index 575fed455c1..8f2f0fd9c64 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -302,7 +302,7 @@ public class SettingsActivity extends Activity
             NotificationAppList.class.getName(),
             AppNotificationSettings.class.getName(),
             OtherSoundSettings.class.getName(),
-            ApnSettings.class.getName()
+            ApnSettings.class.getName(),
             QuickLaunchSettings.class.getName(),
             WifiCallingSettings.class.getName()
     };