am 0716ea14: Merge "Javadoc updates for NFC." into gingerbread

* commit '0716ea144d94b9dfce4670e90a849db19a492da9':
  Javadoc updates for NFC.