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