tree 43ed84e2324fb6ea5966a61ea71780096eccde4c
parent 5cfa75875fcb2701fbe3b8cf861c4c1d0e38e5e7
parent ff8018dcbd0488160519481d4ca1567fa397d44e
author Nick Pelly <npelly@google.com> 1287618445 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1287618445 -0700

am ff8018dc: Merge "Fix NFC permission." into gingerbread

Merge commit 'ff8018dcbd0488160519481d4ca1567fa397d44e' into gingerbread-plus-aosp

* commit 'ff8018dcbd0488160519481d4ca1567fa397d44e':
  Fix NFC permission.