commit 5ed4fc9efda45d2411b8b9bc8cab55b8e270b13c
author Deepanshu Gupta <deepanshu@google.com> Mon Feb 23 19:15:57 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Feb 23 19:15:57 2015 +0000
tree 21387acdcc41fe6d3bf0683828b71fa6076a4d8d
parent d77380b856050a5d933cbd4cc0ada6192de65f48
parent 99142d298213e93f673057c2334b04b38f7e4450

am 99142d29: am 3f8e2b93: am 30a67cd1: Merge "Set forceFramework correctly for included layouts." into lmp-dev

* commit '99142d298213e93f673057c2334b04b38f7e4450':
  Set forceFramework correctly for included layouts.

tools/layoutlib/bridge/src/android/view/BridgeInflater.java

diff --git a/tools/layoutlib/bridge/src/android/view/BridgeInflater.java b/tools/layoutlib/bridge/src/android/view/BridgeInflater.java
index 36102f1..7e4ff69 100644
--- a/tools/layoutlib/bridge/src/android/view/BridgeInflater.java
+++ b/tools/layoutlib/bridge/src/android/view/BridgeInflater.java
@@ -179,7 +179,7 @@
                         XmlPullParser parser = ParserFactory.create(f);
 
                         BridgeXmlBlockParser bridgeParser = new BridgeXmlBlockParser(
-                                parser, bridgeContext, false);
+                                parser, bridgeContext, value.isFramework());
 
                         return inflate(bridgeParser, root);
                     } catch (Exception e) {