summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Elliott Hughes <enh@google.com> 2014-04-29 04:05:25 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2014-04-29 04:05:25 +0000
commit45641ecd2c4be60390319614f519d2313dbd547d (patch)
treeb65e1adf12a7708b52810aea4c281ee429ce2fab
parentc4e6f6d2827ad526f562a5882975f42eee69486c (diff)
parent7af8f5ba9cc7801fabe70bcf13e602aaa73dc428 (diff)
am 7af8f5ba: am 10d57c4b: Merge "Fix two zygote imports."
* commit '7af8f5ba9cc7801fabe70bcf13e602aaa73dc428': Fix two zygote imports.
-rw-r--r--core/java/com/android/internal/os/ZygoteInit.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/com/android/internal/os/ZygoteInit.java b/core/java/com/android/internal/os/ZygoteInit.java
index 484d2c3e1cb9..3d97d0ca0e95 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;