tree d0b1a21d2db64b65778cf5c6a9c6cef262a35825
parent ac2fbe8507f7295681a528e6858a0fb6676f7324
parent c120c3fecb193835d56beec245913111f2fc8e41
author Scott Main <smain@google.com> 1377214332 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1377214332 -0700

am c120c3fe: am 1ef0d363: am 285f0772: Merge "clean up the sample template files to remove unused stuff and fix the collapsible project list and highlight the Samples nav" into jb-mr2-docs

* commit 'c120c3fecb193835d56beec245913111f2fc8e41':
  clean up the sample template files to remove unused stuff and fix the collapsible project list and highlight the Samples nav