From: Nick Kralevich <nnk@google.com>
Date: Fri, 19 Oct 2012 22:00:49 +0000 (-0700)
Subject: resolved conflicts for merge of e206e7c9 to jb-mr1-dev-plus-aosp
X-Git-Tag: android-x86-4.4-r1~168^2~53
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=7c3fb24095a3f6cf2ca6e25ddb4af24933ff3e4d;p=android-x86%2Fdalvik.git

resolved conflicts for merge of e206e7c9 to jb-mr1-dev-plus-aosp

Change-Id: I52fcfbdeb6bbb39c5330ce2be589ec546805aa1f
---

7c3fb24095a3f6cf2ca6e25ddb4af24933ff3e4d
diff --cc vm/native/dalvik_system_Zygote.cpp
index 7c0eaa264,d441d29fd..f8938899b
--- a/vm/native/dalvik_system_Zygote.cpp
+++ b/vm/native/dalvik_system_Zygote.cpp
@@@ -29,13 -29,8 +29,14 @@@
  #include <errno.h>
  #include <paths.h>
  #include <sys/personality.h>
 +#include <sys/stat.h>
 +#include <sys/mount.h>
 +#include <linux/fs.h>
 +#include <cutils/fs.h>
  #include <cutils/sched_policy.h>
 +#include <cutils/multiuser.h>
 +#include <sched.h>
+ #include <sys/utsname.h>
  
  #if defined(HAVE_PRCTL)
  # include <sys/prctl.h>