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

* commit '7af8f5ba9cc7801fabe70bcf13e602aaa73dc428':
  Fix two zygote imports.
This commit is contained in:
Elliott Hughes
2014-04-29 04:05:25 +00:00
committed by Android Git Automerger

View File

@@ -16,8 +16,8 @@
package com.android.internal.os; package com.android.internal.os;
import static libcore.io.OsConstants.S_IRWXG; import static android.system.OsConstants.S_IRWXG;
import static libcore.io.OsConstants.S_IRWXO; import static android.system.OsConstants.S_IRWXO;
import android.content.res.Resources; import android.content.res.Resources;
import android.content.res.TypedArray; import android.content.res.TypedArray;