Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f708d27f authored by Deepanshu Gupta's avatar Deepanshu Gupta
Browse files

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

Change-Id: I91fdb76c748b97376d6469c8d1198a15c4395463
parents 72a20419 fb30a783

tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java

+1 −1
Original line number Diff line number Diff line
@@ -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());

            }

        }