commit cf4f151df47805f227e679d887fe634b48ef7596
author Amith Yamasani <yamasani@google.com> Thu Sep 11 18:32:32 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Sep 11 18:32:32 2014 +0000
tree acdb2aee2c06e2f02e3b21ea106be7527a57de73
parent 0b4bd46d4f844f710bf41da79655dda9413ac20a
parent 0404113ec4ef632e59a61091e14032380e455e21

am 0ec5511e: am 4fa40b32: Fix build

* commit '0ec5511e7beba9c326ceb690553018d23305356f':
  Fix build

services/core/java/com/android/server/pm/Settings.java

diff --git a/services/core/java/com/android/server/pm/Settings.java b/services/core/java/com/android/server/pm/Settings.java
index 529fed1..0dadee7 100644
--- a/services/core/java/com/android/server/pm/Settings.java
+++ b/services/core/java/com/android/server/pm/Settings.java
@@ -36,6 +36,7 @@
 import android.os.PatternMatcher;
 import android.os.Process;
 import android.os.UserHandle;
+import android.os.UserManager;
 import android.util.LogPrinter;
 
 import com.android.internal.util.FastXmlSerializer;