Eric Rowe 86bf0c7b69 am 72a635a1: Merge "DO NOT MERGE Add additional options and receiver to BT tests" into gingerbread ...

Merge commit '72a635a1e08c1fe316dd91786774677abb11aafa' into gingerbread-plus-aosp

* commit '72a635a1e08c1fe316dd91786774677abb11aafa':
  DO NOT MERGE Add additional options and receiver to BT tests

2010-10-18 13:56:31 -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 72a635a1: Merge "DO NOT MERGE Add additional options and receiver to BT tests" into gingerbread

2010-10-18 13:56:31 -07:00