From: Ruchi Kandoi <kandoiruchi@google.com>
Date: Fri, 4 Jan 2019 22:19:23 +0000 (-0800)
Subject: Merge "Add support for FEATURE_NFC_ANDROID_BEAM" am: 6827785e52 am: 39845367ab
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=8925004b514d7bf3c618c017199aa810ca58e94c;p=android-x86%2Fpackages-apps-Settings.git

Merge "Add support for FEATURE_NFC_ANDROID_BEAM" am: 6827785e52 am: 39845367ab
am: a7c886925f

Change-Id: I08ff3b1bd80e913aeec9800b1c5ddce69543ba3c
---

8925004b514d7bf3c618c017199aa810ca58e94c
diff --cc src/com/android/settings/nfc/AndroidBeamPreferenceController.java
index 181faa5021,9fc0aec223..b784dc5bc7
--- a/src/com/android/settings/nfc/AndroidBeamPreferenceController.java
+++ b/src/com/android/settings/nfc/AndroidBeamPreferenceController.java
@@@ -16,8 -16,9 +16,9 @@@
  package com.android.settings.nfc;
  
  import android.content.Context;
+ import android.content.pm.PackageManager;
  import android.nfc.NfcAdapter;
 -import androidx.preference.Preference;
 +
  import androidx.preference.PreferenceScreen;
  
  import com.android.settings.core.BasePreferenceController;