From: Ruben Brunk <rubenbrunk@google.com>
Date: Fri, 8 Apr 2016 05:22:47 +0000 (+0000)
Subject: Merge "Fix Settings activity typo." into nyc-dev am: 77359ad
X-Git-Tag: android-x86-8.1-r1~2948
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ec6e52649d75a00934a87c0a805d1cc2048597b6;p=android-x86%2Fpackages-apps-Settings.git

Merge "Fix Settings activity typo." into nyc-dev am: 77359ad
am: 3f32a9f

* commit '3f32a9ff1011134f7fcfb1da9b108074e3a988bc':
  Fix Settings activity typo.

Change-Id: Idef0d055fadbb2f7b1021bdee2b2601f9add66df
---

ec6e52649d75a00934a87c0a805d1cc2048597b6
diff --cc src/com/android/settings/SettingsActivity.java
index 989f895294,6b9bdb3538..8824b53581
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@@ -67,8 -66,9 +67,9 @@@ import com.android.settings.application
  import com.android.settings.applications.ProcessStatsUi;
  import com.android.settings.applications.UsageAccessDetails;
  import com.android.settings.applications.WriteSettingsDetails;
+ import com.android.settings.applications.VrListenerSettings;
  import com.android.settings.bluetooth.BluetoothSettings;
 -import com.android.settings.dashboard.DashboardSummary;
 +import com.android.settings.dashboard.DashboardContainerFragment;
  import com.android.settings.dashboard.SearchResultsSummary;
  import com.android.settings.datausage.DataUsageSummary;
  import com.android.settings.deviceinfo.PrivateVolumeForget;