tree 0231b7e89c976dfeabc55528c58242291a8308b1
parent 8a33e964c48d22469487c8ec1d951826b7e3e562
parent 8626d1a33609287cffd5b0f7d187f478ff6d22ed
author David Brown <dab@google.com> 1284574514 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1284574514 -0700

am 8626d1a3: Merge "Mark MODIFY_PHONE_STATE permission as signatureOrSystem" into gingerbread

Merge commit '8626d1a33609287cffd5b0f7d187f478ff6d22ed' into gingerbread-plus-aosp

* commit '8626d1a33609287cffd5b0f7d187f478ff6d22ed':
  Mark MODIFY_PHONE_STATE permission as signatureOrSystem