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)

Trivial merge