resolved conflicts for merge of fb30a783 to lmp-mr1-dev

Change-Id: I91fdb76c748b97376d6469c8d1198a15c4395463
2014-12-04 10:30:40 +05:30
parent 72a2041995 fb30a783d3
commit f708d27fa0
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());
            }
        }