Revert "Merge "Resolve merge conflicts of a5f0068 to nyc-dev" into nyc-dev"
This reverts commit 6edfbfabad1ddbda00e0fcc713672f6e63acdf44, reversing
changes made to e09b2c16e32cee89d6b5ac29fe5a905b76872179.
diff --git a/tools/droiddoc/templates-sdk-dev/header.cs b/tools/droiddoc/templates-sdk-dev/header.cs
index 8c67138..e8301be 100644
--- a/tools/droiddoc/templates-sdk-dev/header.cs
+++ b/tools/droiddoc/templates-sdk-dev/header.cs
@@ -1,11 +1,3 @@
-<?cs if:!devsite ?><?cs # leave out the global header for devsite; it is in devsite template ?>
- <?cs call:custom_masthead() ?>
+<?cs call:custom_masthead() ?>
+<?cs call:custom_left_nav() ?>
- <?cs if:(fullpage) ?>
- <?cs call:fullpage() ?>
- <?cs else ?>
- <?cs call:body_content_wrap_start() ?>
- <?cs /if ?>
-
- <?cs call:search_results() ?>
-<?cs /if ?><?cs # end if/else !devsite ?>