summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author smain@google.com <smain@google.com> 2014-06-25 19:21:08 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2014-06-25 19:21:08 +0000
commitd9d9d335fbd88d77ad10f5850e824c72c85bcfb0 (patch)
tree83ef72dc6e0049371cd96d2ea28cf0817d1dc33e
parent92fd15a31f54a76900c2fc27d19ef5313eeeec6f (diff)
parent80c07fb99b5a923ffd35e1b8e4cff64197074aa5 (diff)
am 80c07fb9: am ec6f162f: DO NOT MERGE!
* commit '80c07fb99b5a923ffd35e1b8e4cff64197074aa5': DO NOT MERGE!
-rw-r--r--docs/html/jd_extras.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/html/jd_extras.js b/docs/html/jd_extras.js
index 03bbea193bfa..a61c9792e2ee 100644
--- a/docs/html/jd_extras.js
+++ b/docs/html/jd_extras.js
@@ -1192,4 +1192,4 @@ DISTRIBUTE_RESOURCES = DISTRIBUTE_RESOURCES.concat([
"type": "",
"titleFriendly": ""
}
-]); \ No newline at end of file
+]);