Commit 905e113f authored Jun 04, 2014 by Deepanshu Gupta Committed by Android Git Automerger Jun 04, 2014

am 03df93bc: am 5cde33a6: am dcfba78f: am ed5ab0f0: am 022d8a9f: am bad112f2:...

am 03df93bc: 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 '03df93bc':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]

parents 46c3beef 03df93bc

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -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;