tree 10588bdef6a215101b99b020ed8dfdc42bf52acc
parent 675aa73a83c8cdd5774d713ca849114fa62c1949
parent 5b6d397e211ffaa9069b901cef8fd35c5bd17d01
author Myles Watson <mylesgw@google.com> 1497665300 +0000
committer android-build-merger <android-build-merger@google.com> 1497665300 +0000

Merge "Simplify NfcCommand and avoid NullPointerExceptions" am: b5c4e80ecd am: 7ba9270427 am: ffd0a7d95c
am: 5b6d397e21

Change-Id: I2cd3fe0600aeface31afa16f999df8065a418b21