Merge master.

gk5885 · gk5885 · commit 31eb5037fffc · 2014-01-31T16:39:54.000-06:00
diff --git a/src/main/java/com/google/testing/compile/Compilation.java b/src/main/java/com/google/testing/compile/Compilation.java
@@ -15,7 +15,7 @@
  */
 package com.google.testing.compile;
 
-import static java.nio.charset.StandardCharsets.UTF_8;
+import static com.google.common.base.Charsets.UTF_8;
 import static javax.tools.JavaFileObject.Kind.SOURCE;
 
 import com.google.common.base.Function;
