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)
commit834735a955e0e3110a3103179b877cd00d8dcd1f
tree00f70c3eeb57169ac03f7b56029de645a32ab55b
parent0fda1ad88c8da426c1e8e88107b05336d135f4cb
parent029f23c32c9fe0c7f288d383a8704bfa420d4ed0
am 029f23c3: am ff8018dc: Merge "Fix NFC permission." into gingerbread

Merge commit '029f23c32c9fe0c7f288d383a8704bfa420d4ed0'

* commit '029f23c32c9fe0c7f288d383a8704bfa420d4ed0':
  Fix NFC permission.
AndroidManifest.xml