Merge "Javadoc updates for NFC." into gingerbread