tree b909f2a7c26d82c1f7cb6d3f7fb7cdb465b360db
parent 8f359afdc3ce3f243d508e81831ed5f274b65534
parent 6136730e3bf463f744d22d4d5a236d9183b9064e
author Martijn Coenen <maco@google.com> 1463509275 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1463509276 +0000

Merge "Adddress NFC API review comments." into nyc-dev