| commit | fe25f5960d2ce56d13653c63952eb0711d548e1b | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Mon Nov 25 16:00:45 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 25 16:00:45 2013 -0800 |
| tree | 4b3ee665c1f4eaa97488acc30003b9bfabc27b3d | |
| parent | b794b9a72dae95696df3dd7770a85d45d2e48651 [diff] | |
| parent | fa91a0705ce6651a3f3f20dd55a86842eea65c2e [diff] |
am fa91a070: Merge remote-tracking branch \'origin/kitkat-dev\' * commit 'fa91a0705ce6651a3f3f20dd55a86842eea65c2e': Initial empty repository
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>