diff options
| author | Narayan Kamath <narayan@google.com> | 2014-04-02 10:29:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-04-02 10:29:55 +0000 |
| commit | 17b1b8fe8c0c8f05f2077acc82428881bf591a78 (patch) | |
| tree | d30579e0b8a4342f6071983f481015860a44fd67 /core/java/android/os | |
| parent | b3cafa56205942343930e4fbb0a3d50d6e33a046 (diff) | |
| parent | 973b4663b0b5ee62006522bf4742af076096e548 (diff) | |
| download | frameworks_base-17b1b8fe8c0c8f05f2077acc82428881bf591a78.zip frameworks_base-17b1b8fe8c0c8f05f2077acc82428881bf591a78.tar.gz frameworks_base-17b1b8fe8c0c8f05f2077acc82428881bf591a78.tar.bz2 | |
Merge "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 631edd6..4cf8767 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; |