diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2014-12-04 10:30:40 +0530 |
|---|---|---|
| committer | Deepanshu Gupta <deepanshu@google.com> | 2014-12-04 10:30:40 +0530 |
| commit | f708d27fa012d7949a761cb7033b874ba86b353e (patch) | |
| tree | 28a88aaa5c5bc4cfe3616ea7de96b197d386e17e /tools | |
| parent | 72a204199510afdeb9cec483b4113433fe61089e (diff) | |
| parent | fb30a783d349578948a57d4e61bb7ddc09edb023 (diff) | |
| download | frameworks_base-f708d27fa012d7949a761cb7033b874ba86b353e.zip frameworks_base-f708d27fa012d7949a761cb7033b874ba86b353e.tar.gz frameworks_base-f708d27fa012d7949a761cb7033b874ba86b353e.tar.bz2 | |
resolved conflicts for merge of fb30a783 to lmp-mr1-dev
Change-Id: I91fdb76c748b97376d6469c8d1198a15c4395463
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java index e1f24ce..e74debb 100644 --- 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()); } } |