commit e3912c91273e31a79de9393a6efa9e2abbb74fd8
author Ed Heyl <edheyl@google.com> Tue Oct 08 15:45:46 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Oct 08 15:45:46 2013 -0700
tree a155fc5324cd2f44a88bed16d33debf6f818ae60
parent 32e261b73311ee2d77d3addc0d006338326ec697
parent 31c9763a1b5f45ee51cef272244a58fb1115945a

am 31c9763a: merge in KQS81M

* commit '31c9763a1b5f45ee51cef272244a58fb1115945a':
  Make inlined CAS32 loop until store is successful if values match.
  Revert "Fix CAS intrinsic to clear exclusive if values don't match."
  Fix ImageHeader.IsValid
  Add flock(2)ing on dex-cache files to prevent races

dalvikvm/dalvikvm.cc

diff --git a/dalvikvm/dalvikvm.cc b/dalvikvm/dalvikvm.cc
index 4607f9a..ea8461f 100644
--- a/dalvikvm/dalvikvm.cc
+++ b/dalvikvm/dalvikvm.cc
@@ -16,6 +16,7 @@
 
 #include <signal.h>
 
+#include <algorithm>
 #include <cstdio>
 #include <cstring>
 #include <string>