OSDN Git Service

Merge "NFC sample app" into honeycomb
authorTrevor Johns <trevorjohns@google.com>
Wed, 19 Jan 2011 23:23:41 +0000 (15:23 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 19 Jan 2011 23:23:41 +0000 (15:23 -0800)

Trivial merge