tree 16d49c9070e600205bfadc87db85607c24041ba0
parent a6a3c6da1c1df6971948e594cb267bf71c122aaf
parent 9a6c8168f743c1dc8cc28de22fe12be4623434cd
author Scott Main <smain@google.com> 1261212070 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1261212070 -0800

am 9a6c8168: am 77fa05a4: Merge change Iab5952e1 into eclair

Merge commit '9a6c8168f743c1dc8cc28de22fe12be4623434cd'

* commit '9a6c8168f743c1dc8cc28de22fe12be4623434cd':
  docs: add "required" attribute to the <uses-feature> docs