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

* commit '10d57c4bc7459d0c73b254af006a3528e9a0c33e':
  Fix two zygote imports.
This commit is contained in:
Elliott Hughes
2014-04-29 04:01:01 +00:00
committed by Android Git Automerger

View File

@@ -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;