commit db3da9bbc62be22d96cdf61f02afe271174f50be
author Scott Main <smain@google.com> Wed Dec 19 19:29:21 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Wed Dec 19 19:29:21 2012 -0800
tree 5644ee4cd642ee1a7eca84c23ba54881cdfe4c08
parent ead4b642cffe258e08326628af2c83c99c14df1f
parent c9cea375c3c66df33f4535e986c00a68f390ac62

am c9cea375: am 707909f2: Merge "docs: don\'t allow setting the sidenav fixed if the doc body is shorter than the sidenav. Scrolling won\'t be possible in this case anyway, but this change fixes a glitch that happens on OSX Lion because it will allow scrolling anyway 

* commit 'c9cea375c3c66df33f4535e986c00a68f390ac62':
  docs: don't allow setting the sidenav fixed if the doc body is shorter than the sidenav. Scrolling won't be possible in this case anyway, but this change fixes a glitch that happens on OSX Lion because it will allow scrolling anyway for the overscroll bounce.