Merge "remove the animated scroll adjustment for sticky nav. Instead adjust the scrol...

author Scott Main <smain@google.com>

Tue, 15 Apr 2014 02:38:34 +0000 (02:38 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Tue, 15 Apr 2014 02:38:35 +0000 (02:38 +0000)
author Scott Main <smain@google.com>
Tue, 15 Apr 2014 02:38:34 +0000 (02:38 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 15 Apr 2014 02:38:35 +0000 (02:38 +0000)
diff --cc tools/droiddoc/templates-sdk-dyn/assets/js/docs.js
Simple merge
author	Scott Main <smain@google.com>
	Tue, 15 Apr 2014 02:38:34 +0000 (02:38 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 15 Apr 2014 02:38:35 +0000 (02:38 +0000)