summaryrefslogtreecommitdiffstats
path: root/tools/droiddoc
diff options
context:
space:
mode:
authorsmain@google.com <smain@google.com>2014-06-25 20:45:52 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-06-25 20:45:52 +0000
commit4bc8177434826dbd58b3f365edbd7c7d27d80e9e (patch)
tree59d198f6e0f139770b47ffe5488966d0465b60ae /tools/droiddoc
parent0e9f646d39a625aec47db151e7955022bfbfcef1 (diff)
parente022e9a7139a55ed8d9fcc9dca3ffdf37727b164 (diff)
downloadbuild-4bc8177434826dbd58b3f365edbd7c7d27d80e9e.zip
build-4bc8177434826dbd58b3f365edbd7c7d27d80e9e.tar.gz
build-4bc8177434826dbd58b3f365edbd7c7d27d80e9e.tar.bz2
am e022e9a7: am bb9ecf42: undo the butterbar change, because automerger is ruthless
* commit 'e022e9a7139a55ed8d9fcc9dca3ffdf37727b164': undo the butterbar change, because automerger is ruthless
Diffstat (limited to 'tools/droiddoc')
-rw-r--r--tools/droiddoc/templates-sdk/components/masthead.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/droiddoc/templates-sdk/components/masthead.cs b/tools/droiddoc/templates-sdk/components/masthead.cs
index 43194ad..c880eee 100644
--- a/tools/droiddoc/templates-sdk/components/masthead.cs
+++ b/tools/droiddoc/templates-sdk/components/masthead.cs
@@ -298,4 +298,4 @@ color:#666;font-weight:100;font-size:27px;">L Developer Preview</h1></div>
</div>
<?cs
-/def ?> \ No newline at end of file
+/def ?>