tree 7d12c351979cc37a1735c95633b9557a70ae66fc
parent 65fe00812e220419d053adc8d910b2f19eed9c3a
parent 15434e7cccee95b2d63e61a2cd12a5e32dc757d7
author Scott Main <smain@google.com> 1355532509 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1355532509 -0800

am 15434e7c: am a828b8ff: am 3b16e13c: am 3a494adf: Merge "docs: add cursorloader class to side nav" into jb-mr1-dev

* commit '15434e7cccee95b2d63e61a2cd12a5e32dc757d7':
  docs: add cursorloader class to side nav