commit 904b89c58465b0d0822478be514572ec752df3e8
author Deepanshu Gupta <deepanshu@google.com> Wed Jun 04 20:14:52 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Jun 04 20:14:52 2014 +0000
tree ec453528b8f4f93109fb82ec1c2e1ea70dce4989
parent f52fcc70541224c2d926f59461bde5a8bd6545a7
parent 295184bc71a32a4e9418d34b2adeb0cef4b39781

am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev

* commit '295184bc71a32a4e9418d34b2adeb0cef4b39781':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]

tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderSessionImpl.java

diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderSessionImpl.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderSessionImpl.java
index 9fc66f0..9a7fe18 100644
--- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderSessionImpl.java
+++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderSessionImpl.java
@@ -87,6 +87,7 @@
 import android.view.ViewGroup.MarginLayoutParams;
 import android.view.ViewParent;
 import android.view.WindowManagerGlobal_Delegate;
+import android.view.ViewParent;
 import android.widget.AbsListView;
 import android.widget.AbsSpinner;
 import android.widget.AdapterView;