resolved conflicts for merge of 6d3c4ab2 to jb-mr1-dev

Change-Id: I5c4634897882deb663f32d8148202d7c9189521d

diff --cc tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java
Simple merge

diff --cc tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderSessionImpl.java
index 3d5c9c6,28c5f65..17715b0
--- 1/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderSessionImpl.java
--- 2/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderSessionImpl.java
+++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderSessionImpl.java
@@@ -43,14 -43,18 +43,16 @@@ import com.android.layoutlib.bridge.Bri
  import com.android.layoutlib.bridge.android.BridgeContext;
  import com.android.layoutlib.bridge.android.BridgeLayoutParamsMapAttributes;
  import com.android.layoutlib.bridge.android.BridgeXmlBlockParser;
- import com.android.layoutlib.bridge.bars.FakeActionBar;
+ import com.android.layoutlib.bridge.bars.ActionBarLayout;
+ import com.android.layoutlib.bridge.bars.CustomBar;
  import com.android.layoutlib.bridge.bars.NavigationBar;
  import com.android.layoutlib.bridge.bars.StatusBar;
 -import com.android.layoutlib.bridge.bars.TabletSystemBar;
  import com.android.layoutlib.bridge.bars.TitleBar;
  import com.android.layoutlib.bridge.impl.binding.FakeAdapter;
  import com.android.layoutlib.bridge.impl.binding.FakeExpandableAdapter;
+ import com.android.resources.Density;
  import com.android.resources.ResourceType;
  import com.android.resources.ScreenOrientation;
 -import com.android.resources.ScreenSize;
  import com.android.util.Pair;
  
  import org.xmlpull.v1.XmlPullParserException;