6066da89a4
Merge commit '590b73bc5b8e5f7b59bff1d9264a52388a5162e6' into gingerbread-plus-aosp * commit '590b73bc5b8e5f7b59bff1d9264a52388a5162e6': NFC API revision round 2.