am 0ad4f2ce: resolved conflicts for merge of 7377c7be to jb-mr1-dev

* commit '0ad4f2cedde037c2b09a7f09c5f95f0984267c64':
  Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]

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

@@ -184,6 +184,8 @@ public class RenderSessionImpl extends RenderAction<SessionParams> {
         SessionParams params = getParams();
         BridgeContext context = getContext();
 
+        context.getIWindowManager().setHasNavBar(params.getHardwareConfig().hasSoftwareButtons());
+
         RenderResources resources = getParams().getResources();
         DisplayMetrics metrics = getContext().getMetrics();