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

* commit 'b2ded18a84b3b23a76b462644dcd24b3c33f5234':
  Fix typos in previous bugfixes.
This commit is contained in:
Deepanshu Gupta
2014-12-04 15:16:37 +00:00
committed by Android Git Automerger

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.
ResourceReference ref = resolveId(resid);
if (ref != null) {
mRenderResources.getStyle(ref.getName(), ref.isFramework());
style = mRenderResources.getStyle(ref.getName(), ref.isFramework());
}
}