| commit | b794b9a72dae95696df3dd7770a85d45d2e48651 | [log] [tgz] |
|---|---|---|
| author | Ed Heyl <edheyl@google.com> | Wed Oct 16 17:40:45 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 16 17:40:45 2013 -0700 |
| tree | 4b3ee665c1f4eaa97488acc30003b9bfabc27b3d | |
| parent | 8ab30e0cee32a012a36dc0b57b8c6f036df986dd [diff] | |
| parent | 56cbb5872a5b48815311f2c6a1a3292682a56afa [diff] |
am 56cbb587: merge in klp-release (no-op) * commit '56cbb5872a5b48815311f2c6a1a3292682a56afa':
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>