commit 13e5f4213ccb7fcc88e4a0ea05e604686b051967
author The Android Automerger <android-build@google.com> Tue Feb 02 07:28:15 2016 -0800
committer The Android Automerger <android-build@google.com> Tue Feb 02 07:28:15 2016 -0800
tree 71fbce4229e6ed13b588fd2ee88c5f5baf651cac
parent 3c35d94857fcaafa692ab8c5583b97a470a638f4
parent 1b7e8fc50c4adb264f77b218673171709a4379b3

merge in nyc-release history after reset to master

.gitignore

diff --git a/.gitignore b/.gitignore
index 3093115..91df226 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,4 +6,3 @@
 *.DS_Store
 .idea/workspace.xml
 .idea/libraries
-.idea/modules

compilerCommon/src/main/java/android/databinding/tool/util/L.java

diff --git a/compilerCommon/src/main/java/android/databinding/tool/util/L.java b/compilerCommon/src/main/java/android/databinding/tool/util/L.java
index 37292b2..9a7e307 100644
--- a/compilerCommon/src/main/java/android/databinding/tool/util/L.java
+++ b/compilerCommon/src/main/java/android/databinding/tool/util/L.java
@@ -21,6 +21,7 @@
 import java.io.PrintWriter;
 import java.io.StringWriter;
 
+import javax.lang.model.element.AnnotationMirror;
 import javax.lang.model.element.Element;
 import javax.tools.Diagnostic;
 import javax.tools.Diagnostic.Kind;
@@ -41,7 +42,7 @@
     private static Client sClient = sSystemClient;
 
     public static void setClient(Client systemClient) {
-        sClient = systemClient;
+        L.sClient = systemClient;
     }
 
     public static void setDebugLog(boolean enabled) {
@@ -128,13 +129,12 @@
     }
 
     private static String getStackTrace(Throwable t) {
-        StringWriter sw = new StringWriter();
-        PrintWriter pw = new PrintWriter(sw);
+        PrintWriter pw = new PrintWriter(new StringWriter());
         try {
             t.printStackTrace(pw);
         } finally {
             pw.close();
         }
-        return sw.toString();
+        return pw.toString();
     }
 }