tree a21825b90578906c4dd662efb06f6888b1a385b9
parent a749593dd64f6d8f8d5d5e6addd16699258e9130
parent 40a7e3c425120661c305999f7c2bdd76d3240b7d
author Scott Main <smain@google.com> 1391124308 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1391124308 +0000

am 40a7e3c4: am e71cc6fd: am 897739f1: Merge "Revert "add Cast to the sidenav"" into klp-docs

* commit '40a7e3c425120661c305999f7c2bdd76d3240b7d':
  Revert "add Cast to the sidenav"