OSDN Git Service

am e15902d6: am 4325f808: Update NFC to use a SwitchPreference
authorFabrice Di Meglio <fdimeglio@google.com>
Fri, 15 Aug 2014 21:42:46 +0000 (21:42 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 15 Aug 2014 21:42:46 +0000 (21:42 +0000)
* commit 'e15902d61727e7924563ef76113fa49a65358ca8':
  Update NFC to use a SwitchPreference


Trivial merge