tree a5a6a11ebba69635cd0d14d9d5c0268c5feee249
parent 8d378137afcf980d6c28908f1ed8b71f51fc0b26
parent 05d14cb9f03044e11f7c056dae1e576bb5cd3716
author Scott Main <smain@google.com> 1296325778 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1296325778 -0800

am 05d14cb9: (-s ours) Merge "don\'t use the sdkdoc template if the index file is a preview (the features.html doc is no longer used, so removed check for that also)" into gingerbread

* commit '05d14cb9f03044e11f7c056dae1e576bb5cd3716':
  don't use the sdkdoc template if the index file is a preview (the features.html doc is no longer used, so removed check for that also)