diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2014-06-04 20:38:25 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-04 20:38:25 +0000 |
| commit | dcfba78fbb4dad6792113383b2d32eff7f2c1f88 (patch) | |
| tree | 64855e6a990c18dc7f87677a66b845170f68ccd8 /tools | |
| parent | 328b1f92787bb4d793398ba6d8aa9b2025c62ca1 (diff) | |
| parent | ed5ab0f01eac6686165f67fe0e9dec3bb48bbb4b (diff) | |
| download | frameworks_base-dcfba78fbb4dad6792113383b2d32eff7f2c1f88.zip frameworks_base-dcfba78fbb4dad6792113383b2d32eff7f2c1f88.tar.gz frameworks_base-dcfba78fbb4dad6792113383b2d32eff7f2c1f88.tar.bz2 | |
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 'ed5ab0f01eac6686165f67fe0e9dec3bb48bbb4b':
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; |