tree 1241f67c12c5cdd672102695ffc260308fc649f7
parent a929ea12d8291dee5804b3a9a1e5a54719224d41
parent 65fd9811d3b00698ab25233543c2e49ef22c634b
author Dirk Dougherty <ddougherty@google.com> 1359757340 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1359757340 -0800

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 (Google) Code Review (1) and others
* commit '65fd9811d3b00698ab25233543c2e49ef22c634b':
  Doc change: remove htmlified samples from docs build for now. Samples are still downloadable thorugh SDK Manager.