Nick Pelly 68cea27329 am e58e8a71: Merge "Added NdefFormatable tag, initial class with supported methods." into gingerbread ...

* commit 'e58e8a715b2c9e4f2d053e0dc95e88690a54c059':
  Added NdefFormatable tag, initial class with supported methods.

2010-12-06 18:44:13 -08:00

..

config

…

java

am e58e8a71: Merge "Added NdefFormatable tag, initial class with supported methods." into gingerbread

2010-12-06 18:44:13 -08:00

jni

am 251384a7: Merge "Improve performance when getting styled string."

2010-11-19 10:25:09 -08:00

res

am eba947a3: Merge "Remove ACTION_TAG_DISCOVERED from protected broadcast list." into gingerbread

2010-12-06 17:45:25 -08:00

tests

am 3591bebd: Merge "Restore Wi-Fi configuration after the test. DO NOT MERGE" into gingerbread

2010-12-02 13:44:54 -08:00