6b09a90a81
Merge commit 'e47150e933e6f610546f57183477f324566e521e' into gingerbread-plus-aosp * commit 'e47150e933e6f610546f57183477f324566e521e': Fix up NFC permissions.