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

* commit '243a28ba2d58acea96a33cd6c73cb805a653863f':
  Doc change: Update uses-feature and permissions docs.