summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorMartijn Coenen <maco@google.com>2012-05-21 12:43:26 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-05-21 12:43:26 -0700
commit4e7293861f218e617c17d5af02ae9c797fc4a48c (patch)
tree891175bf538b8f9a0d6b2ff9e187a9e1de015ce6 /res
parent5bc9a1d4952980dce4ebd4ceb42ecae8f1c6660b (diff)
parente769540a26900bb809c210c976eaca3ac6cf2605 (diff)
downloadpackages_apps_nfc-4e7293861f218e617c17d5af02ae9c797fc4a48c.zip
packages_apps_nfc-4e7293861f218e617c17d5af02ae9c797fc4a48c.tar.gz
packages_apps_nfc-4e7293861f218e617c17d5af02ae9c797fc4a48c.tar.bz2
am e769540a: am 1179ee22: Merge "Close NFCEE when NFC is being shut down." into jb-dev
* commit 'e769540a26900bb809c210c976eaca3ac6cf2605': Close NFCEE when NFC is being shut down.
Diffstat (limited to 'res')
0 files changed, 0 insertions, 0 deletions