diff options
author | Martijn Coenen <maco@google.com> | 2013-03-01 00:17:27 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-03-01 00:17:27 +0000 |
commit | 6bcc04895961e4392ffb6d156a55848c49159cde (patch) | |
tree | c48b949d4bb13046760bea8f96879deddd77f623 /res/values-hi | |
parent | ce64f787f3cf037003f782c382072872e9b5e0a4 (diff) | |
parent | 696652d7f9faaffd198073cb75eb86156f7d9af4 (diff) | |
download | android_packages_apps_Nfc-6bcc04895961e4392ffb6d156a55848c49159cde.tar.gz android_packages_apps_Nfc-6bcc04895961e4392ffb6d156a55848c49159cde.tar.bz2 android_packages_apps_Nfc-6bcc04895961e4392ffb6d156a55848c49159cde.zip |
am 696652d7: Merge "Immediately connect to LLCP services." into jb-mr2-dev
* commit '696652d7f9faaffd198073cb75eb86156f7d9af4':
Immediately connect to LLCP services.
Diffstat (limited to 'res/values-hi')
0 files changed, 0 insertions, 0 deletions