Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Deepanshu Gupta
2014-12-04 06:58:20 +00:00
committed by Android (Google) Code Review
parent f164739510 f708d27fa0
commit b2ded18a84
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java
View File

@@ -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. // In some cases, style may not be a dynamic id, so we do a full search.
ResourceReference ref = resolveId(resid); ResourceReference ref = resolveId(resid);
if (ref != null) { if (ref != null) {
mRenderResources.getStyle(ref.getName(), ref.isFramework()); style = mRenderResources.getStyle(ref.getName(), ref.isFramework());
} }
} }