fix: Conflict incoming changes from 15-dev

2025-11-22 17:14:31 +07:00
parent 14e352c827
commit 2e76c99dad
1726 changed files with 146971 additions and 95028 deletions
@@ -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) { }
 }