tree 10d4b58b229952ddba74c998b454b67ce35c5662
parent 6f721c636fc359d5f95c189b58a81c1f667e38f0
parent d0789be41e7e0e23924f0ddccdbb83dcb3b643be
author Dirk Dougherty <ddougherty@google.com> 1254239781 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1254239781 -0700

am bc0e07bf: Merge change I7b64ad2e into donut

Merge commit 'bc0e07bf9ad21d9237713d58879c00556d70b1f2' into eclair

* commit 'bc0e07bf9ad21d9237713d58879c00556d70b1f2':
  doc change only. fix toc links on terms page.