summaryrefslogtreecommitdiffstats
path: root/core/java/android/nfc
diff options
context:
space:
mode:
authorSvetoslav Ganov <svetoslavganov@google.com>2011-11-01 21:58:52 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2011-11-01 21:58:52 +0000
commit25fd58aae3084f70a3b74bef7e19b34a31ba1e91 (patch)
tree1af70853287da477ae7597b7f5d5a0584ef0feea /core/java/android/nfc
parentfe5f0aae6546ff673a6f01298f427bcd568bdd1a (diff)
parent62015f5d0d1104dfc682b3eb3b6c0be4f63b985a (diff)
downloadframeworks_base-25fd58aae3084f70a3b74bef7e19b34a31ba1e91.zip
frameworks_base-25fd58aae3084f70a3b74bef7e19b34a31ba1e91.tar.gz
frameworks_base-25fd58aae3084f70a3b74bef7e19b34a31ba1e91.tar.bz2
am 62015f5d: am aeb11b59: Merge "Folding Accessibility Service sample into ApiDemos." into ics-mr0
* commit '62015f5d0d1104dfc682b3eb3b6c0be4f63b985a': Folding Accessibility Service sample into ApiDemos.
Diffstat (limited to 'core/java/android/nfc')
0 files changed, 0 insertions, 0 deletions