commit 45641ecd2c4be60390319614f519d2313dbd547d
author Elliott Hughes <enh@google.com> Tue Apr 29 04:05:25 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Apr 29 04:05:25 2014 +0000
tree b65e1adf12a7708b52810aea4c281ee429ce2fab
parent c4e6f6d2827ad526f562a5882975f42eee69486c
parent 7af8f5ba9cc7801fabe70bcf13e602aaa73dc428

am 7af8f5ba: am 10d57c4b: Merge "Fix two zygote imports."

* commit '7af8f5ba9cc7801fabe70bcf13e602aaa73dc428':
  Fix two zygote imports.

core/java/com/android/internal/os/ZygoteInit.java

diff --git a/core/java/com/android/internal/os/ZygoteInit.java b/core/java/com/android/internal/os/ZygoteInit.java
index 484d2c3..3d97d0c 100644
--- a/core/java/com/android/internal/os/ZygoteInit.java
+++ b/core/java/com/android/internal/os/ZygoteInit.java
@@ -16,8 +16,8 @@
 
 package com.android.internal.os;
 
-import static libcore.io.OsConstants.S_IRWXG;
-import static libcore.io.OsConstants.S_IRWXO;
+import static android.system.OsConstants.S_IRWXG;
+import static android.system.OsConstants.S_IRWXO;
 
 import android.content.res.Resources;
 import android.content.res.TypedArray;