am 0237cf2e: am 8626d1a3: Merge "Mark MODIFY_PHONE_STATE permission as...
am 0237cf2e: am 8626d1a3: Merge "Mark MODIFY_PHONE_STATE permission as signatureOrSystem" into gingerbread
Merge commit '0237cf2e'
* commit '0237cf2e':
Mark MODIFY_PHONE_STATE permission as signatureOrSystem