From c74a1b441490e5648ac4388baeccb78cae4ab364 Mon Sep 17 00:00:00 2001
From: Brad Fitzpatrick <bradfitz@android.com>
Date: Fri, 10 Sep 2010 16:03:29 -0700
Subject: [PATCH] Fix build caused by automerger and missing imports in master.

gingerbread had an import android.os.*.  master doesn't.  auto-merger
applied it fine, but it doesn't compile.

Change-Id: I28d7b5053616a40223eeb29a0669831d5ca76d9e
---
 services/java/com/android/server/SystemServer.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index 0eef06dc100b8..3abac0d7b7e23 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -33,9 +33,11 @@ import android.content.Context;
 import android.content.pm.IPackageManager;
 import android.database.ContentObserver;
 import android.media.AudioService;
+import android.os.Build;
 import android.os.Looper;
 import android.os.RemoteException;
 import android.os.ServiceManager;
+import android.os.StrictMode;
 import android.os.SystemClock;
 import android.os.SystemProperties;
 import android.provider.Settings;