tree 76a85ebc08e2538fb6a27cea972455efcc38a856
parent 02c26c2cf8d8a5751ae5167c15a4d3fcb24bc5c0
parent 784d3ca78c97f797f848e59b17ce2c73b8c84ea3
author Scott Main <smain@google.com> 1324064059 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1324064059 -0800

am 5e7bed0b: am 0f52d766: Merge "docs: fix whitespace in sidenav" into ics-mr1

* commit '5e7bed0b2a16c91d90bd274b4fdfe7c6718f11c2':
  docs: fix whitespace in sidenav