OSDN Git Service

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

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