diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2014-06-04 20:17:40 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-04 20:17:40 +0000 |
| commit | ffcad247d0401fb529441ecc65437226c2845461 (patch) | |
| tree | f239843fc95b6771bfcb9aad6bbcbe3532778611 /tools | |
| parent | b1ca2a0c7fda713f5f2ebe928706dd813d87cabb (diff) | |
| parent | 904b89c58465b0d0822478be514572ec752df3e8 (diff) | |
| download | frameworks_base-ffcad247d0401fb529441ecc65437226c2845461.zip frameworks_base-ffcad247d0401fb529441ecc65437226c2845461.tar.gz frameworks_base-ffcad247d0401fb529441ecc65437226c2845461.tar.bz2 | |
am 904b89c5: am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev
* commit '904b89c58465b0d0822478be514572ec752df3e8':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
Diffstat (limited to 'tools')
| -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 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.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; |