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)
commitf955d057ddd232af4bd4a74075838dae298c7365
tree2ca12712ca9cf0c63f643e3f5ce7af55b15a4308
parent85a80ba8cd92fd0a7f7e4a899e772b0f6a50a9d7
parentc6a0277bca29359ec1aee123495065982d2eea7a
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.
core/java/android/nfc/NfcAdapter.java