am 4e4d0d5f: am 36a1bcee: Merge "Doc change: Update uses-feature and permissions docs." into froyo

* commit '4e4d0d5f207421b0a2ce134fe17d7c78defc9dac':
  Doc change: Update uses-feature and permissions docs.