commit 1e7b4b850fc3cc141f81a053f3a0467993f11eb9
author Zak Cohen <zakcohen@google.com> Wed Jun 03 21:05:59 2020 -0700
committer Zak Cohen <zakcohen@google.com> Thu Jun 04 04:07:34 2020 +0000
tree 2d897854bbd902121bda58eb2a1950c2259af869
parent 1b5923e5e5899cac76260253faf81390190a9aa4

Resolve markers - Fix build break.

Test: local compile
Bug: 156757117

Change-Id: I95cdfa34ecde95768f82a14463a4b91cf5012d8e

quickstep/src/com/android/quickstep/SystemUiProxy.java

diff --git a/quickstep/src/com/android/quickstep/SystemUiProxy.java b/quickstep/src/com/android/quickstep/SystemUiProxy.java
index cdffb91..299e9e5 100644
--- a/quickstep/src/com/android/quickstep/SystemUiProxy.java
+++ b/quickstep/src/com/android/quickstep/SystemUiProxy.java
@@ -31,6 +31,7 @@
 import com.android.launcher3.util.MainThreadInitializedObject;
 import com.android.systemui.shared.recents.IPinnedStackAnimationListener;
 import com.android.systemui.shared.recents.ISystemUiProxy;
+import com.android.systemui.shared.recents.model.Task;
 
 /**
  * Holds the reference to SystemUI.
@@ -344,8 +345,6 @@
             }
         }
     }
-<<<<<<< HEAD   (e557ba Merging from ub-launcher3-rvc-dev @ build 6552182)
-=======
 
     @Override
     public void handleImageBundleAsScreenshot(Bundle screenImageBundle, Rect locationInScreen,
@@ -359,5 +358,4 @@
             }
         }
     }
->>>>>>> CHANGE (03e456 Screenshots - move to new api that uses image bundle.)
 }