diff options
| author | Narayan Kamath <narayan@google.com> | 2014-04-02 10:41:24 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-02 10:41:24 +0000 |
| commit | 71ab4f4f48a9b8b485d80adf18d568ef6265b1e8 (patch) | |
| tree | ca12bff66cf7347fa38937f5aea088e2583bbac5 /core/java/android/os | |
| parent | 04c2a5571620927f702af3707845b1b05769dc46 (diff) | |
| parent | ea9e5ecac1e5240370f0e3f998b9c8b159ee9320 (diff) | |
| download | frameworks_base-71ab4f4f48a9b8b485d80adf18d568ef6265b1e8.zip frameworks_base-71ab4f4f48a9b8b485d80adf18d568ef6265b1e8.tar.gz frameworks_base-71ab4f4f48a9b8b485d80adf18d568ef6265b1e8.tar.bz2 | |
am ea9e5eca: am 17b1b8fe: Merge "Move zygote startup logic to the frameworks."
* commit 'ea9e5ecac1e5240370f0e3f998b9c8b159ee9320':
Move zygote startup logic to the frameworks.
Diffstat (limited to 'core/java/android/os')
| -rw-r--r-- | core/java/android/os/Process.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/java/android/os/Process.java b/core/java/android/os/Process.java index 057f516..3241693 100644 --- a/core/java/android/os/Process.java +++ b/core/java/android/os/Process.java @@ -16,10 +16,11 @@ package android.os; -import android.net.LocalSocketAddress; import android.net.LocalSocket; +import android.net.LocalSocketAddress; import android.util.Log; -import dalvik.system.Zygote; + +import com.android.internal.os.Zygote; import java.io.BufferedWriter; import java.io.DataInputStream; |