resolved conflicts for merge of 93160828 to master-lockscreen-dev

Change-Id: Ief6d6b8b8cc9ae2eb38442a3ba9ecae4637b75d6

diff --cc packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
Simple merge

diff --cc packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
index dcc6f37,4730f2f..3b119a1
--- 1/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
--- 2/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
@@@ -87,9 -86,6 +87,8 @@@ import com.android.internal.statusbar.S
  import com.android.systemui.DemoMode;
  import com.android.systemui.EventLogTags;
  import com.android.systemui.R;
- import com.android.systemui.SwipeHelper;
 +import com.android.systemui.SystemUIApplication;
 +import com.android.systemui.keyguard.KeyguardViewMediator;
  import com.android.systemui.statusbar.BaseStatusBar;
  import com.android.systemui.statusbar.CommandQueue;
  import com.android.systemui.statusbar.GestureRecorder;
@@@ -103,9 -100,8 +102,7 @@@ import com.android.systemui.statusbar.p
  import com.android.systemui.statusbar.policy.HeadsUpNotificationView;
  import com.android.systemui.statusbar.policy.LocationController;
  import com.android.systemui.statusbar.policy.NetworkController;
- import com.android.systemui.statusbar.policy.NotificationRowLayout;
- import com.android.systemui.statusbar.policy.OnSizeChangedListener;
  import com.android.systemui.statusbar.policy.RotationLockController;
 -
  import com.android.systemui.statusbar.stack.NotificationStackScrollLayout;
  
  import java.io.FileDescriptor;