Eric Rowe 72a635a1e0 Merge "DO NOT MERGE Add additional options and receiver to BT tests" into gingerbread

2010-10-18 13:53:48 -07:00

..

config

…

java

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

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

jni

Fix issue 3098880.

2010-10-15 12:33:16 -07:00

res

Fix up NFC permissions.

2010-10-18 10:04:40 -07:00

tests

Merge "DO NOT MERGE Add additional options and receiver to BT tests" into gingerbread

2010-10-18 13:53:48 -07:00