diff options
| author | 2014-06-04 20:45:02 +0000 | |
|---|---|---|
| committer | 2014-06-04 20:45:02 +0000 | |
| commit | 03df93bcb854eedc600ef0120fd238ec974c44a1 (patch) | |
| tree | 799e82b0d7ba37a74af3d95e5cc59dc8cdd61db9 | |
| parent | 3ce1ca68309231e693964824917a66f36e575fd7 (diff) | |
| parent | 5cde33a6ffd6a3be87f6622e67c3d83fb61519cb (diff) | |
am 5cde33a6: am dcfba78f: am ed5ab0f0: am 022d8a9f: am bad112f2: am c8235b8e: am ffcad247: am 904b89c5: am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev
* commit '5cde33a6ffd6a3be87f6622e67c3d83fb61519cb':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
| -rw-r--r-- | tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderSessionImpl.java | 1 |
1 files changed, 1 insertions, 0 deletions
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 84fb1414805e..bd42ca42c812 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.LayoutParams; 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; |