tree c029bf867419aa3d97697f8d1709009e43aaacf2
parent b705eea70245dae69d16e18d63b3ee38e1d0c5c3
parent 105e1c5adc3da14996d659ac403e7254b81bcb76
author Scott Main <smain@google.com> 1275511613 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1275511613 -0700

am 105e1c5a: am 6a297118: Merge "docs: a couple doc bug fixes" into froyo

Merge commit '105e1c5adc3da14996d659ac403e7254b81bcb76' into kraken

* commit '105e1c5adc3da14996d659ac403e7254b81bcb76':
  docs: a couple doc bug fixes