tree 4c49fb7abab08772e9cb6f4652ad620361e13d15
parent 774b943fc6baa7d3e2880382d4dc7ab085d54b65
parent e47150e933e6f610546f57183477f324566e521e
author Nick Pelly <npelly@google.com> 1287422772 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1287422772 -0700

am e47150e9: Fix up NFC permissions.

Merge commit 'e47150e933e6f610546f57183477f324566e521e' into gingerbread-plus-aosp

* commit 'e47150e933e6f610546f57183477f324566e521e':
  Fix up NFC permissions.