summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorMartijn Coenen <maco@google.com>2011-10-21 14:38:37 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-10-21 14:38:37 -0700
commit2ab89f6ee6603c210923f4d3c0799de1664dc6f5 (patch)
treed798d32d30effdc6463736953e43ab9acef5da77 /res
parent9a8cbd141eb21bf00b0a489c4487314add510b70 (diff)
parent51c44537dd9c3fef019f031cc220ca225a360ef0 (diff)
downloadpackages_apps_nfc-2ab89f6ee6603c210923f4d3c0799de1664dc6f5.zip
packages_apps_nfc-2ab89f6ee6603c210923f4d3c0799de1664dc6f5.tar.gz
packages_apps_nfc-2ab89f6ee6603c210923f4d3c0799de1664dc6f5.tar.bz2
am 51c44537: Merge "Start all NFC activities from a dedicated root task." into ics-mr0
* commit '51c44537dd9c3fef019f031cc220ca225a360ef0': Start all NFC activities from a dedicated root task.
Diffstat (limited to 'res')
0 files changed, 0 insertions, 0 deletions