am 15f107b1: Merge "New API stubs: NdefMessage and NdefRecord." into gingerbread

Merge commit '15f107b151deff1f25f1255bdbcb630ed576ac8d' into gingerbread-plus-aosp

* commit '15f107b151deff1f25f1255bdbcb630ed576ac8d':
  New API stubs: NdefMessage and NdefRecord.