From 949dbf7629eacfa02f267ade4643c98aef8e42a9 Mon Sep 17 00:00:00 2001
From: Chet Haase <chet@google.com>
Date: Wed, 11 Aug 2010 18:41:06 -0700
Subject: [PATCH] Fix the build from two breaking changes (update to
 current.xml and ViewRoot import)

Change-Id: I987b12f7c5fdd4137faa55405fce99bd6f73fc71
---
 api/current.xml                      | 8 ++++----
 core/java/android/view/ViewRoot.java | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/api/current.xml b/api/current.xml
index 0f304494fb980..2c88f11e98776 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -4336,7 +4336,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843560"
+ value="16843561"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -4347,7 +4347,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843561"
+ value="16843562"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -4358,7 +4358,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843558"
+ value="16843559"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -4369,7 +4369,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="16843559"
+ value="16843560"
  static="true"
  final="true"
  deprecated="not deprecated"
diff --git a/core/java/android/view/ViewRoot.java b/core/java/android/view/ViewRoot.java
index 692d1963c405e..faa478309fc48 100644
--- a/core/java/android/view/ViewRoot.java
+++ b/core/java/android/view/ViewRoot.java
@@ -33,6 +33,7 @@ import android.util.Config;
 import android.util.DisplayMetrics;
 import android.util.Log;
 import android.util.EventLog;
+import android.util.Slog;
 import android.util.SparseArray;
 import android.view.View.MeasureSpec;
 import android.view.accessibility.AccessibilityEvent;