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

* commit 'a3e4293cdc7d09ac93c95d233e4052ac4435773e':
  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