OSDN Git Service

Merge "Fixes Settings app crashing when NfcAdapter is null"
authorTreeHugger Robot <treehugger-gerrit@google.com>
Wed, 1 Aug 2018 21:52:40 +0000 (21:52 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 1 Aug 2018 21:52:40 +0000 (21:52 +0000)

Trivial merge