commit 4d71a15b87e4b67c035216c06aac75837f94af61
author Omari Stephens <xsdg@android.com> Thu Aug 27 12:35:29 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Aug 27 12:35:29 2015 +0000
tree c348c2f897a693f2968ca14ea23e5991da75e502
parent 6915b7b2b0676a14e2a21da15909f38da29e905e
parent 9577e3e583a53cff3bd808aeae2cca896092c161

am 9577e3e5: am d7a6af33: (-s ours) am 274a19e4: Display annotations and annotation values when they are requested (cherry-picked from commit 6fa3e41df1664e59c13830b012b9be39c2b31cae)

* commit '9577e3e583a53cff3bd808aeae2cca896092c161':

README.version

diff --git a/README.version b/README.version
new file mode 100644
index 0000000..f7c1fa0
--- /dev/null
+++ b/README.version
@@ -0,0 +1,3 @@
+URL: https://code.google.com/p/doclava/downloads/detail?name=doclava-1.0.6-bundle.zip&can=2&q=
+Version: 1.0.6
+BugComponent: 27745

src/com/google/doclava/Doclava.java

diff --git a/src/com/google/doclava/Doclava.java b/src/com/google/doclava/Doclava.java
index 23ede5f..8ad3904 100644
--- a/src/com/google/doclava/Doclava.java
+++ b/src/com/google/doclava/Doclava.java
@@ -799,11 +799,11 @@
         String templ = relative + f.getName();
         int len = templ.length();
         if (len > 3 && ".cs".equals(templ.substring(len - 3))) {
-          Data data = makeHDF();
+          Data data = makePackageHDF();
           String filename = templ.substring(0, len - 3) + htmlExtension;
           ClearPage.write(data, templ, filename, js);
         } else if (len > 3 && ".jd".equals(templ.substring(len - 3))) {
-          Data data = makeHDF();
+          Data data = makePackageHDF();
           String filename = templ.substring(0, len - 3) + htmlExtension;
           DocFile.writePage(f.getAbsolutePath(), relative, filename, data);
         } else if(!f.getName().equals(".DS_Store")){

src/com/google/doclava/Stubs.java

diff --git a/src/com/google/doclava/Stubs.java b/src/com/google/doclava/Stubs.java
index fa82802..65aa8d8 100644
--- a/src/com/google/doclava/Stubs.java
+++ b/src/com/google/doclava/Stubs.java
@@ -1537,9 +1537,7 @@
 
   static void writeConstructorKeepList(PrintStream keepListWriter, MethodInfo mi) {
     keepListWriter.print("    ");
-    String name = mi.name();
-    name = name.replace(".", "$");
-    keepListWriter.print(name);
+    keepListWriter.print("<init>");
 
     writeParametersKeepList(keepListWriter, mi, mi.parameters());
     keepListWriter.print(";\n");