summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorMartijn Coenen <maco@google.com>2011-11-17 15:12:58 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-11-17 15:12:58 -0800
commitc171c42ca5de4b63f0a5b4f2de152d57fc0581ac (patch)
tree1aa1965931bd82efcf5587623ba76e4a854c395d /res
parent61b453290d9603e371fd3e5882a050d3db473500 (diff)
parent806a78272a812f274309bd902b319590a254a896 (diff)
downloadpackages_apps_nfc-c171c42ca5de4b63f0a5b4f2de152d57fc0581ac.zip
packages_apps_nfc-c171c42ca5de4b63f0a5b4f2de152d57fc0581ac.tar.gz
packages_apps_nfc-c171c42ca5de4b63f0a5b4f2de152d57fc0581ac.tar.bz2
am 806a7827: Merge "Also send NFCEE broadcasts to dynamically registered receivers." into ics-mr1
* commit '806a78272a812f274309bd902b319590a254a896': Also send NFCEE broadcasts to dynamically registered receivers.
Diffstat (limited to 'res')
0 files changed, 0 insertions, 0 deletions