am fbbe2cd2: am 055e4ea5: Merge change Ief544bc6 into eclair-mr2
am fbbe2cd2: am 055e4ea5: Merge change Ief544bc6 into eclair-mr2

Merge commit 'fbbe2cd28a7185fb1a64d780a8839494f9cbe866'

* commit 'fbbe2cd28a7185fb1a64d780a8839494f9cbe866':
  fix grammar in the grant permissions UI

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base