diff options
author | Martijn Coenen <maco@google.com> | 2013-03-11 17:13:17 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-03-11 17:13:17 +0000 |
commit | 36b876fccafa226f6097ff8bcd463f612143c579 (patch) | |
tree | 777cf70556795fe551cb9ae2657b7826cd5f2cad /res/values-fi/strings.xml | |
parent | 1836c78d3005fbbd09b5ec249633f6f0dd2f8d76 (diff) | |
parent | 8540a8a7857c44b0f9f04fcfecfb271492f5e99b (diff) | |
download | android_packages_apps_Nfc-36b876fccafa226f6097ff8bcd463f612143c579.tar.gz android_packages_apps_Nfc-36b876fccafa226f6097ff8bcd463f612143c579.tar.bz2 android_packages_apps_Nfc-36b876fccafa226f6097ff8bcd463f612143c579.zip |
am 8540a8a7: Merge "Disable UICC_IDLE feature when host is talking to SE." into jb-mr2-dev
* commit '8540a8a7857c44b0f9f04fcfecfb271492f5e99b':
Disable UICC_IDLE feature when host is talking to SE.
Diffstat (limited to 'res/values-fi/strings.xml')
0 files changed, 0 insertions, 0 deletions