OSDN Git Service

am 029f23c3: am ff8018dc: Merge "Fix NFC permission." into gingerbread
authorNick Pelly <npelly@google.com>
Thu, 21 Oct 2010 20:46:55 +0000 (13:46 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 21 Oct 2010 20:46:55 +0000 (13:46 -0700)
Merge commit '029f23c32c9fe0c7f288d383a8704bfa420d4ed0'

* commit '029f23c32c9fe0c7f288d383a8704bfa420d4ed0':
  Fix NFC permission.

1  2 
AndroidManifest.xml

Simple merge