summaryrefslogtreecommitdiffstats
path: root/res/values-hi
diff options
context:
space:
mode:
authorMartijn Coenen <maco@google.com>2014-11-21 02:19:40 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-11-21 02:19:40 +0000
commit36fd0e12c803b253e6849a3268618e981bc41658 (patch)
treebbd3c732f668389599ef6f23d4d9ea3483f063cc /res/values-hi
parent216d8b08c4d7cdba12760ad4430dc3adcf88a1cc (diff)
parentddec9bbd279796a34049638e58b260b276072ba3 (diff)
downloadandroid_packages_apps_Nfc-36fd0e12c803b253e6849a3268618e981bc41658.tar.gz
android_packages_apps_Nfc-36fd0e12c803b253e6849a3268618e981bc41658.tar.bz2
android_packages_apps_Nfc-36fd0e12c803b253e6849a3268618e981bc41658.zip
am ddec9bbd: am b1fc5454: am 14ca2264: Merge "Add verifyNfcPermission()." into lmp-mr1-dev
* commit 'ddec9bbd279796a34049638e58b260b276072ba3': Add verifyNfcPermission().
Diffstat (limited to 'res/values-hi')
0 files changed, 0 insertions, 0 deletions