tree 5d0143b0482a677178fac694a571ce0a6765fe9f
parent 6a4c6f43ea936c487a7b2c8797d93daedf1532e6
parent 5fca0efa17c85945fc42cb1a890889f3fab8ec00
author Dirk Dougherty <ddougherty@google.com> 1359997625 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1359997625 -0800

am 5fca0efa: am 6cb87b08: am 65fd9811: am 2aa47b33: Merge "Doc change: remove htmlified samples from docs build for now. Samples are still downloadable thorugh SDK Manager." into jb-mr1-dev

# Via Android Git Automerger (3) and others
* commit '5fca0efa17c85945fc42cb1a890889f3fab8ec00':
  Doc change: remove htmlified samples from docs build for now. Samples are still downloadable thorugh SDK Manager.