OSDN Git Service

am 47e5794b: am d42ad1da: Merge "NFC API documentation." into jb-dev
authorMartijn Coenen <maco@google.com>
Mon, 21 May 2012 19:42:22 +0000 (12:42 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 21 May 2012 19:42:22 +0000 (12:42 -0700)
* commit '47e5794baa1518ed0236176d965843dfbbb851eb':
  NFC API documentation.


Trivial merge