summaryrefslogtreecommitdiffstats
path: root/src/com/android/nfc/SendUi.java
diff options
context:
space:
mode:
authorMartijn Coenen <maco@google.com>2012-05-17 15:33:34 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-05-17 15:33:34 -0700
commit8a704e7cfd941feb40b2ba62035943c3d389c13e (patch)
tree900464e6cf0580e5537fa7d45220f365bb0f6a42 /src/com/android/nfc/SendUi.java
parent6c6de7bffe437d756f9eebf86bd80dd76429930e (diff)
parent8baa9162ad3593b248fb6801b8feb30ad581467b (diff)
downloadpackages_apps_nfc-8a704e7cfd941feb40b2ba62035943c3d389c13e.zip
packages_apps_nfc-8a704e7cfd941feb40b2ba62035943c3d389c13e.tar.gz
packages_apps_nfc-8a704e7cfd941feb40b2ba62035943c3d389c13e.tar.bz2
am 8baa9162: am 05d74c94: Merge "Bluetooth Beam handover: deal with multi-file transfers." into jb-dev
* commit '8baa9162ad3593b248fb6801b8feb30ad581467b': Bluetooth Beam handover: deal with multi-file transfers.
Diffstat (limited to 'src/com/android/nfc/SendUi.java')
0 files changed, 0 insertions, 0 deletions