fix: Conflict incoming changes from 15-dev
This commit is contained in:
1 parent
14e352c827
commit
2e76c99dad
1726 files changed
+146970
-95027
No files matched your search
@@ -29,5 +29,7 @@ public class StateManagerProtoLogProxy {
|
||||
|
||||
public static void logOnStateTransitionEnd(Object state) { }
|
||||
|
||||
public static void logOnRepeatStateSetAborted(Object state) { }
|
||||
|
||||
public static void logCancelAnimation(boolean animationOngoing, String trace) { }
|
||||
}
|
||||
Reference in new issue
Block a user