summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Elliott Hughes <enh@google.com> 2014-04-29 04:01:01 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2014-04-29 04:01:01 +0000
commit7af8f5ba9cc7801fabe70bcf13e602aaa73dc428 (patch)
treee5621585d066bfee374a841317e731786508012a
parentcf939672f8c6e1ee29ae38f0e3665ab966491f7f (diff)
parent10d57c4bc7459d0c73b254af006a3528e9a0c33e (diff)
am 10d57c4b: Merge "Fix two zygote imports."
* commit '10d57c4bc7459d0c73b254af006a3528e9a0c33e': 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 1a83bceff41c..bee1391b534e 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;