Nick Pelly c2e4daacb4 am 1f90908c: Merge "Prevent use of NFC api if device is not featurized for NFC." into gingerbread ...

Merge commit '1f90908c19ab24791bd54c856b32bb12682496eb' into gingerbread-plus-aosp

* commit '1f90908c19ab24791bd54c856b32bb12682496eb':
  Prevent use of NFC api if device is not featurized for NFC.

2010-10-18 12:04:16 -07:00

..

config

…

java

am 1f90908c: Merge "Prevent use of NFC api if device is not featurized for NFC." into gingerbread

2010-10-18 12:04:16 -07:00

jni

am 208bb08a: Merge "Fix issue 3098880." into gingerbread

2010-10-15 18:42:06 -07:00

res

am e47150e9: Fix up NFC permissions.

2010-10-18 10:26:12 -07:00

tests

am 8f666c2d: Merge "Test that we don\'t leak sensitive information when logging cookies." into gingerbread

2010-10-14 16:02:57 -07:00