From: Treehugger Robot <treehugger-gerrit@google.com>
Date: Thu, 9 Aug 2018 21:37:17 +0000 (+0000)
Subject: Merge "Fix ACTION_NFC_SETTINGS doesn't show connection preference"
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=44360bc96aa7297be4f7a24f41e07ddbd7815934;p=android-x86%2Fpackages-apps-Settings.git

Merge "Fix ACTION_NFC_SETTINGS doesn't show connection preference"
---

44360bc96aa7297be4f7a24f41e07ddbd7815934