tree 81c817f1eb9602df46f340081cbde21a5f98b03c
parent b25425148d0964bf16532a82ca4e4e096759759d
parent 1e2934b048a36b8172715893193a84bde8667b00
author Scott Main <smain@google.com> 1354310222 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1354310222 -0800

am 1e2934b0: am 4e477d7b: Merge "docs/css: break words that are too long to fit sidenav; add style for google javadocs" into jb-mr1-dev

* commit '1e2934b048a36b8172715893193a84bde8667b00':
  docs/css: break words that are too long to fit sidenav; add style for google javadocs