commit 3f8e2b9302fba0ace67fb0459d6ffb0884c4d80b
author Deepanshu Gupta <deepanshu@google.com> Mon Feb 23 19:03:29 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Feb 23 19:03:29 2015 +0000
tree 0909b8b9e69c732abefb5c9d673a9deb4bbc2b09
parent 09e9076ddfd5e9f738cd5096409ff3fb61174803
parent 30a67cd17af03e53b8be5638f7f70d2989a7cd78

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

* commit '30a67cd17af03e53b8be5638f7f70d2989a7cd78':
  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) {