tree bc367a5d181b3d6c09c9acfb932083ae0ab74ad7
parent 139ac3e470eb4f2aac4ae92d5f97c9c1190f3b77
parent 610d72deb5838b4f980a4d69322ad8732f8adc37
author Nick Pelly <npelly@google.com> 1294117261 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1294117261 -0800

am 163bd407: Merge "Added getType() to NDEF technology class (API part)." into gingerbread

* commit '163bd407492bbadcdc8f0759191e1b9142d06859':
  Added getType() to NDEF technology class (API part).