summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/nfc/AndroidBeam.java
diff options
context:
space:
mode:
authorPrzemyslaw Szczepaniak <pszczepaniak@google.com>2014-03-13 23:12:10 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-13 23:12:10 +0000
commitcc91f6ff662dbac9ae78c4b68c94e3210c4c876a (patch)
tree1b252b6495e62dae7a3210cfbc19b2c41c13d41f /src/com/android/settings/nfc/AndroidBeam.java
parent7e74b409aabaf5d69b770ba18d75fdedc14b1b26 (diff)
parent7a5911a96d158567bac1e892aee813af1b563a46 (diff)
downloadpackages_apps_Settings-cc91f6ff662dbac9ae78c4b68c94e3210c4c876a.zip
packages_apps_Settings-cc91f6ff662dbac9ae78c4b68c94e3210c4c876a.tar.gz
packages_apps_Settings-cc91f6ff662dbac9ae78c4b68c94e3210c4c876a.tar.bz2
am 7a5911a9: am 375545e2: am 6829c48c: Merge "Fix F/C in TTS settings"
* commit '7a5911a96d158567bac1e892aee813af1b563a46': Fix F/C in TTS settings
Diffstat (limited to 'src/com/android/settings/nfc/AndroidBeam.java')
0 files changed, 0 insertions, 0 deletions