diff options
| author | Narayan Kamath <narayan@google.com> | 2014-04-02 10:35:38 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-02 10:35:38 +0000 |
| commit | ea9e5ecac1e5240370f0e3f998b9c8b159ee9320 (patch) | |
| tree | f3cbeb7e387593aad1afe4550c0fbcc639a13892 /core/java/android/os | |
| parent | 095ece10095ecb8c76e3ed4fb0dd1e23a5ced22b (diff) | |
| parent | 17b1b8fe8c0c8f05f2077acc82428881bf591a78 (diff) | |
| download | frameworks_base-ea9e5ecac1e5240370f0e3f998b9c8b159ee9320.zip frameworks_base-ea9e5ecac1e5240370f0e3f998b9c8b159ee9320.tar.gz frameworks_base-ea9e5ecac1e5240370f0e3f998b9c8b159ee9320.tar.bz2 | |
am 17b1b8fe: Merge "Move zygote startup logic to the frameworks."
* commit '17b1b8fe8c0c8f05f2077acc82428881bf591a78':
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; |