Merge "resolved conflicts for merge of fb30a783 to lmp-mr1-dev" into lmp-mr1-dev

2014-12-04 06:58:20 +00:00
parent f164739510 f708d27fa0
commit b2ded18a84
1 changed files with 1 additions and 1 deletions
--- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java
+++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java
@@ -483,7 +483,7 @@ public final class BridgeContext extends Context {
            // In some cases, style may not be a dynamic id, so we do a full search.
            ResourceReference ref = resolveId(resid);
            if (ref != null) {
-                mRenderResources.getStyle(ref.getName(), ref.isFramework());
+                style = mRenderResources.getStyle(ref.getName(), ref.isFramework());
            }
        }