tree 1da85f32dbecd5d62e79d5a68d57f0398547714b
parent d3f9cedda450f54e8a91902f21f7a16d1c14abd6
parent 5f50306d2604e5968d8638dc23428e69a2352dc6
author Scott Main <smain@google.com> 1273675859 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1273675859 -0700

am 18dc51d4: Merge "docs: fix broken anchor names" into froyo

Merge commit '18dc51d4137c5cf8364541e25ad9ded203342c6b' into froyo-plus-aosp

* commit '18dc51d4137c5cf8364541e25ad9ded203342c6b':
  docs: fix broken anchor names