OSDN Git Service

Merge "NFC payment settings."
authorMartijn Coenen <maco@google.com>
Wed, 7 Aug 2013 02:28:40 +0000 (02:28 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 7 Aug 2013 02:28:40 +0000 (02:28 +0000)
commit7f34fab684e8f5adaccd410c163ad44f9b1df731
treed923bb1fa05084fbb4c55f5bb7879cdf28dbe952
parentb75f10305dee24b1444735623f7c45b1a782606a
parent26515da08707b6f8182cc8b0ed5e01e97aa92a96
Merge "NFC payment settings."
AndroidManifest.xml
src/com/android/settings/Settings.java