summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/nfc/AndroidBeam.java
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2012-08-28 11:10:06 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-08-28 11:10:06 -0700
commit300457bad289f547430da21e72747e8840840832 (patch)
treebfbc8d73c5aa8ed9959ad1189f5957c6ee4762cd /src/com/android/settings/nfc/AndroidBeam.java
parent41446512cfa6e009187b7cc67fa34a29f82ddccc (diff)
parent38ce5194e89b83697466abe2994016507109ec54 (diff)
downloadpackages_apps_settings-300457bad289f547430da21e72747e8840840832.zip
packages_apps_settings-300457bad289f547430da21e72747e8840840832.tar.gz
packages_apps_settings-300457bad289f547430da21e72747e8840840832.tar.bz2
am 38ce5194: Merge "Enable to delete a stored persistent group from p2p settings."
* commit '38ce5194e89b83697466abe2994016507109ec54': Enable to delete a stored persistent group from p2p settings.
Diffstat (limited to 'src/com/android/settings/nfc/AndroidBeam.java')
0 files changed, 0 insertions, 0 deletions