OSDN Git Service

Merge "Make nfc toggability logic static and public." into oc-dr1-dev
authorDaniel Nishi <dhnishi@google.com>
Tue, 1 Aug 2017 23:18:58 +0000 (23:18 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 1 Aug 2017 23:18:58 +0000 (23:18 +0000)
commitea39f74a42a265ddd0ac50e53966342c06c40c06
tree2e88eb51407b632a3368bc62cdcf5ba2b1dd2fb0
parent4f368a3acc2f3b8d6c7d5298d8c1acd9c256d346
parentb27d65fa55ad1e172e361447011423a3d1f89c5a
Merge "Make nfc toggability logic static and public." into oc-dr1-dev
am: b27d65fa55

Change-Id: Id09171357fb772cc05ec668eafa10e5320cefeb5
src/com/android/settings/nfc/NfcPreferenceController.java