Commits
Nick Pelly authored and Android Git Automerger committed 886fd91833eM
am c0e93a84: am 7ea5c45e: NFC settings cleanup. Merge commit 'c0e93a849f82c97b847c9ad39b18e594f3bb3f5a' * commit 'c0e93a849f82c97b847c9ad39b18e594f3bb3f5a': NFC settings cleanup.
Showing diff to9509527eb60