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

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

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base