OSDN Git Service

am c6a0277b: am 63b7360e: Merge "Fix NPE on devices that don\'t have NFC." into ics-mr1
authorNick Pelly <npelly@google.com>
Thu, 17 Nov 2011 23:12:56 +0000 (15:12 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 17 Nov 2011 23:12:56 +0000 (15:12 -0800)
commit1fa578c5df86dc3b0b416c98640f8a06f9bc4f62
tree27bbc5d508fc7a2ddaa93dcf8bdc84e0ba691b97
parent98019c135cc261ec7e4e089afdf042d311aba54b
parent637742c34e9db537260bfbd02b461218d2a8f214
am c6a0277b: am 63b7360e: Merge "Fix NPE on devices that don\'t have NFC." into ics-mr1

* commit 'c6a0277bca29359ec1aee123495065982d2eea7a':
  Fix NPE on devices that don't have NFC.