| commit | 5c77c126b258924961a4a9c784177b4bcd403dd0 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Fri Apr 04 01:54:05 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Apr 04 01:54:05 2014 +0000 |
| tree | dcc6cccf22009d510db6d7476e3cb808d8bde3b5 | |
| parent | ef9f3043f5259fa55376a1522152779295e15da6 [diff] | |
| parent | b6588c522451f5015c2cbc902d5a72566f979f2b [diff] |
am b6588c52: Merge "Fix NPE in layoutlib. [DO NOT MERGE]" into jb-mr2-dev * commit 'b6588c522451f5015c2cbc902d5a72566f979f2b': Fix NPE in layoutlib. [DO NOT MERGE]
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 23d08e3..60f5331 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 @@ mContext.getRenderResources().setLogger(null); } - mContext = null; } public static BridgeContext getCurrentContext() {