From: TreeHugger Robot <treehugger-gerrit@google.com>
Date: Wed, 1 Aug 2018 21:52:40 +0000 (+0000)
Subject: Merge "Fixes Settings app crashing when NfcAdapter is null"
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=5ec759f970f3ed11878cbb5473ef11556d9108e5;p=android-x86%2Fpackages-apps-Settings.git

Merge "Fixes Settings app crashing when NfcAdapter is null"
---

5ec759f970f3ed11878cbb5473ef11556d9108e5