tree 4ab9c2f41c50fe8c8a3546e71440f2dc9995a30f
parent 52cdd29ecb575d9716f223fc6fb6a9e4cc5231df
parent e60bb383aa2eb09ec834d3fb6b53eadaefe5ae0d
author Scott Main <smain@google.com> 1286584560 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1286584560 -0700

am bed5af7e: am 456fe3b3: add some pages to the sitemap file in an attempt to kick-start the build server so i can get a doc build

Merge commit 'bed5af7ebcd195a2ab5e16fc03ee8b61a4d7aec6' into gingerbread-plus-aosp

* commit 'bed5af7ebcd195a2ab5e16fc03ee8b61a4d7aec6':
  add some pages to the sitemap file in an attempt to kick-start the build server so i can get a doc build