diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-12-13 14:55:25 -0800 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2010-12-13 14:55:25 -0800 |
| commit | ccc714131359eb1022d8c6702b7d82ab9e93f27c (patch) | |
| tree | 150c9798fc3d0d5dfee9c83d75845014a5edf983 /policy/src | |
| parent | ffdd591a829af7fddd36a7b80d2a3b8188c871a6 (diff) | |
| parent | 78e9f4cbaece783b7b87ce3fb0a157dae766012a (diff) | |
| download | frameworks_base-ccc714131359eb1022d8c6702b7d82ab9e93f27c.zip frameworks_base-ccc714131359eb1022d8c6702b7d82ab9e93f27c.tar.gz frameworks_base-ccc714131359eb1022d8c6702b7d82ab9e93f27c.tar.bz2 | |
resolved conflicts for merge of 78e9f4cb to master
Change-Id: I1135361e6d66f524c3f349e2bf1f31bd4191c634
Diffstat (limited to 'policy/src')
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/RecentApplicationsDialog.java | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/policy/src/com/android/internal/policy/impl/RecentApplicationsDialog.java b/policy/src/com/android/internal/policy/impl/RecentApplicationsDialog.java index f53092d..db66346 100644 --- a/policy/src/com/android/internal/policy/impl/RecentApplicationsDialog.java +++ b/policy/src/com/android/internal/policy/impl/RecentApplicationsDialog.java @@ -33,7 +33,6 @@ import android.content.pm.ResolveInfo; import android.graphics.drawable.Drawable; import android.os.Bundle; import android.os.Handler; -import android.os.RemoteException; import android.util.Log; import android.view.View; import android.view.Window; |