summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Deepanshu Gupta <deepanshu@google.com> 2013-11-18 10:11:47 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2013-11-18 10:11:47 -0800
commit42453ede3335aa5f7007a5b36749e84df83a08d4 (patch)
treeb386f59269a264ee6378e2fa48bccf1a8cec9719
parent253a352f8c351201781fe5e677ddc588b3527a95 (diff)
parent599105a92ceb24f0f09beb11be18126ae4e8efdf (diff)
am 599105a9: Merge "Fix NPE in layoutlib. DO NOT MERGE" into klp-dev
* commit '599105a92ceb24f0f09beb11be18126ae4e8efdf': Fix NPE in layoutlib. DO NOT MERGE
-rw-r--r--tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderAction.java1
1 files changed, 0 insertions, 1 deletions
diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderAction.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderAction.java
index 23d08e343bdb..60f5331aefdb 100644
--- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderAction.java
+++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderAction.java
@@ -273,7 +273,6 @@ public abstract class RenderAction<T extends RenderParams> extends FrameworkReso
mContext.getRenderResources().setLogger(null);
}
- mContext = null;
}
public static BridgeContext getCurrentContext() {