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

* commit '36a1bcee76d35636b4050674eb98285c3a3a6c2f':
  Doc change: Update uses-feature and permissions docs.