am 61f1cbdd: am a800a2ef: Merge "Adding a feature definition corresponding to...
am 61f1cbdd: am a800a2ef: Merge "Adding a feature definition corresponding to support for Near-Field Communications (NFC)." into gingerbread
Merge commit '61f1cbdd'
* commit '61f1cbdd':
Adding a feature definition corresponding to support for Near-Field