tree fd8455c16d6f6756c2381d0d885deb955c87f63c
parent 967c143f9123e5a8a1fdfd5b44e953abb9258b57
parent 5eb239555c293a42cd7e0f1cf9dfed0453b292cc
author Dirk Dougherty <ddougherty@google.com> 1288745034 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1288745034 -0700

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

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