resolved conflicts for merge of 1adca55f to mnc-dr-dev

[android-x86/packages-apps-Settings.git] / src / com / android / settings / deviceinfo / UsbModeChooserActivity.java

diff --git a/src/com/android/settings/deviceinfo/UsbModeChooserActivity.java b/src/com/android/settings/deviceinfo/UsbModeChooserActivity.java
index 8f5a6a8..77fc388 100644 (file)
--- a/src/com/android/settings/deviceinfo/UsbModeChooserActivity.java
+++ b/src/com/android/settings/deviceinfo/UsbModeChooserActivity.java
@@ -51,6 +51,7 @@ public class UsbModeChooserActivity extends Activity {
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
+
         super.onCreate(savedInstanceState);
 
         mLayoutInflater = LayoutInflater.from(this);