Merge stage-aosp-master into pi-dev-plus-aosp
am: 57c0d2d54d

Change-Id: I2c1d007fd31301d8e8815e890b5e4bcbb4b810d6
diff --git a/src/jdiff/HTMLReportGenerator.java b/src/jdiff/HTMLReportGenerator.java
index b906959..d040641 100755
--- a/src/jdiff/HTMLReportGenerator.java
+++ b/src/jdiff/HTMLReportGenerator.java
@@ -818,16 +818,6 @@
 
     /** Write the HTML footer. */
     public void writeHTMLFooter() {
-        writeText("<script src=\"https://www.google-analytics.com/ga.js\" type=\"text/javascript\">");
-        writeText("</script>");
-        writeText("<script type=\"text/javascript\">");
-        writeText("  try {");
-        writeText("    var pageTracker = _gat._getTracker(\"UA-5831155-1\");");
-        writeText("    pageTracker._setAllowAnchor(true);");
-        writeText("    pageTracker._initData();");
-        writeText("    pageTracker._trackPageview();");
-        writeText("  } catch(e) {}");
-        writeText("</script>");
         writeText("</BODY>");
         writeText("</HTML>");
     }
diff --git a/src/jdiff/HTMLStatistics.java b/src/jdiff/HTMLStatistics.java
index 31fa213..c8f9a5e 100755
--- a/src/jdiff/HTMLStatistics.java
+++ b/src/jdiff/HTMLStatistics.java
@@ -164,18 +164,6 @@
             h_.writeText("    </div> <!-- end footer -->");
             h_.writeText("    </div><!-- end doc-content -->");
             h_.writeText("    </div> <!-- end body-content --> ");
-
-            h_.writeText("<script src=\"https://www.google-analytics.com/ga.js\" type=\"text/javascript\">");
-            h_.writeText("</script>");
-            h_.writeText("<script type=\"text/javascript\">");
-            h_.writeText("  try {");
-            h_.writeText("    var pageTracker = _gat._getTracker(\"UA-5831155-1\");");
-            h_.writeText("    pageTracker._setAllowAnchor(true);");
-            h_.writeText("    pageTracker._initData();");
-            h_.writeText("    pageTracker._trackPageview();");
-            h_.writeText("  } catch(e) {}");
-            h_.writeText("</script>");
-
             h_.writeText("</BODY></HTML>");
             h_.reportFile.close();
         } catch(IOException e) {