am d81c68c3: am a743448a: Merge "Tweak Ndef.getType() API. Rename constants, expand javadoc." into gingerbread

* commit 'd81c68c31e916fa201f4cd608261afa4d1f0adb6':
  Tweak Ndef.getType() API. Rename constants, expand javadoc.