| commit | 29b4986ecce1592bd2fe62024bb187dded33c0af | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Fri Apr 04 02:01:48 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Apr 04 02:01:48 2014 +0000 |
| tree | 56c3f120042c3dfc2602bdd95a74ad2d1d9f9bb0 | |
| parent | ce393373b73e1a1f30ce9bb41568d415cab7df49 [diff] | |
| parent | 5c77c126b258924961a4a9c784177b4bcd403dd0 [diff] |
am 5c77c126: am b6588c52: Merge "Fix NPE in layoutlib. [DO NOT MERGE]" into jb-mr2-dev * commit '5c77c126b258924961a4a9c784177b4bcd403dd0': 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() {