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

* commit '3f8e2b9302fba0ace67fb0459d6ffb0884c4d80b':
  Set forceFramework correctly for included layouts.
This commit is contained in:
Deepanshu Gupta
2015-02-23 19:09:14 +00:00
committed by Android Git Automerger

View File

@@ -179,7 +179,7 @@ public final class BridgeInflater extends LayoutInflater {
XmlPullParser parser = ParserFactory.create(f); XmlPullParser parser = ParserFactory.create(f);
BridgeXmlBlockParser bridgeParser = new BridgeXmlBlockParser( BridgeXmlBlockParser bridgeParser = new BridgeXmlBlockParser(
parser, bridgeContext, false); parser, bridgeContext, value.isFramework());
return inflate(bridgeParser, root); return inflate(bridgeParser, root);
} catch (Exception e) { } catch (Exception e) {