Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '904b89c58465b0d0822478be514572ec752df3e8':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
This commit is contained in:
Deepanshu Gupta
2014-06-04 20:17:40 +00:00
committed by Android Git Automerger
parent b1ca2a0c7f 904b89c584
commit ffcad247d0
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderSessionImpl.java
View File

@@ -87,6 +87,7 @@ import android.view.ViewGroup.LayoutParams;
import android.view.ViewGroup.MarginLayoutParams; import android.view.ViewGroup.MarginLayoutParams;
import android.view.ViewParent; import android.view.ViewParent;
import android.view.WindowManagerGlobal_Delegate; import android.view.WindowManagerGlobal_Delegate;
import android.view.ViewParent;
import android.widget.AbsListView; import android.widget.AbsListView;
import android.widget.AbsSpinner; import android.widget.AbsSpinner;
import android.widget.AdapterView; import android.widget.AdapterView;