OSDN Git Service

am fd34aa8e: am 5644d0e1: Support for NDEF on iCODE.
authorJeff Hamilton <jham@android.com>
Fri, 25 Feb 2011 04:43:15 +0000 (20:43 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 25 Feb 2011 04:43:15 +0000 (20:43 -0800)
* commit 'fd34aa8e1386547bcfbaf043f26c054946b92c2b':
  Support for NDEF on iCODE.


Trivial merge