OSDN Git Service

am ff8018dc: Merge "Fix NFC permission." into gingerbread
authorNick Pelly <npelly@google.com>
Wed, 20 Oct 2010 23:47:25 +0000 (16:47 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 20 Oct 2010 23:47:25 +0000 (16:47 -0700)
commit029f23c32c9fe0c7f288d383a8704bfa420d4ed0
tree43ed84e2324fb6ea5966a61ea71780096eccde4c
parent5cfa75875fcb2701fbe3b8cf861c4c1d0e38e5e7
parentff8018dcbd0488160519481d4ca1567fa397d44e
am ff8018dc: Merge "Fix NFC permission." into gingerbread

Merge commit 'ff8018dcbd0488160519481d4ca1567fa397d44e' into gingerbread-plus-aosp

* commit 'ff8018dcbd0488160519481d4ca1567fa397d44e':
  Fix NFC permission.
AndroidManifest.xml