1f90908c
Merge commit '1f90908c19ab24791bd54c856b32bb12682496eb' into gingerbread-plus-aosp * commit '1f90908c19ab24791bd54c856b32bb12682496eb': Prevent use of NFC api if device is not featurized for NFC.
b37bca9e
42499170
2c1dab44
fda5b19c
a851d8d0
32e60c79
3ed792d5
736f5ec4
dd644c17
d16f7588
8b525c07
14a288da
c1a564b1
83366dfb
3d01cb93