OSDN Git Service

Merge "Fix NPE on devices that don't have NFC." into ics-mr1
authorNick Pelly <npelly@google.com>
Thu, 17 Nov 2011 20:48:48 +0000 (12:48 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 17 Nov 2011 20:48:48 +0000 (12:48 -0800)
commit3d1e8f0610bf09ca6eca0f04bb7a382f1aed55c3
tree6612a4783a0af5dacf89a520c8ea80420dc0103b
parent2a9e6ac3177626679969dc1f16133d09fc9f7c62
parentdfc0992233ddcef3851a0b2566d8bbc2c9dfa4e0
Merge "Fix NPE on devices that don't have NFC." into ics-mr1