Index: cc/animation/animation_player.cc |
diff --git a/cc/animation/animation_player.cc b/cc/animation/animation_player.cc |
index 698c6ed2e1e6f9bc071a7001cb26bf3980057ee0..b96d5781ed832172246c189bec39e1de3a00e0f4 100644 |
--- a/cc/animation/animation_player.cc |
+++ b/cc/animation/animation_player.cc |
@@ -4,6 +4,8 @@ |
#include "cc/animation/animation_player.h" |
+#include <algorithm> |
danakj
2016/04/25 22:06:23
rebase error? this is the only change in this file
tomhudson
2016/04/27 12:06:47
I'm assuming it was getting this header via some m
|
+ |
#include "cc/animation/animation_delegate.h" |
#include "cc/animation/animation_host.h" |
#include "cc/animation/animation_timeline.h" |