tree 7b16fb6f6bf50feb3c130e615fcac06986d1767f
parent 70d7e5653a2d356c7b9687d238602ab7ad21142d
parent 6698344e3d23e13df2274c0a895fd1c41d0275d8
author Scott Main <smain@google.com> 1261433314 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1261433314 -0800

am 186b94fe: am 74962e56: upload new dev site robots.txt to disallow old tutorial and samples directories (while old pages are still orphaned) and upload new sitemap including new resources pages.

Merge commit '186b94fe60a4cede177bace19b68c72c6f475190'

* commit '186b94fe60a4cede177bace19b68c72c6f475190':
  upload new dev site robots.txt to disallow old tutorial and