OSDN Git Service

Merge "NFC card emulation API docs." into klp-dev
authorMartijn Coenen <maco@google.com>
Mon, 14 Oct 2013 23:30:21 +0000 (23:30 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 14 Oct 2013 23:30:21 +0000 (23:30 +0000)

Trivial merge