commit a13ca400d17750321ac66f6362d7467a3f21d845
author Deepanshu Gupta <deepanshu@google.com> Tue Feb 24 04:52:35 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Feb 24 04:52:35 2015 +0000
tree e30c23cd5f8eb24554545a6303dd20e959ea2f4f
parent 32adbd3524210c20ba794751f390befaffefd212
parent 01d5286f388303551a2eb8f57e210f6d7a690cb5

am 01d5286f: am 8f022fd3: am 5ed4fc9e: am 99142d29: am 3f8e2b93: am 30a67cd1: Merge "Set forceFramework correctly for included layouts." into lmp-dev

* commit '01d5286f388303551a2eb8f57e210f6d7a690cb5':
  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) {