summaryrefslogtreecommitdiffstats
path: root/core/java
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2014-04-29 03:54:49 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-04-29 03:54:49 +0000
commit10d57c4bc7459d0c73b254af006a3528e9a0c33e (patch)
tree2a44024c2c6e0e75cb42c46d2edbccaaa4017d7f /core/java
parent2e9d924d4f4275c72df4be28d85482064cee43f8 (diff)
parenta9569ff70f51a93e134e4d45558884d196b869c3 (diff)
downloadframeworks_base-10d57c4bc7459d0c73b254af006a3528e9a0c33e.zip
frameworks_base-10d57c4bc7459d0c73b254af006a3528e9a0c33e.tar.gz
frameworks_base-10d57c4bc7459d0c73b254af006a3528e9a0c33e.tar.bz2
Merge "Fix two zygote imports."
Diffstat (limited to 'core/java')
-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 1a83bce..bee1391 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;