diff options
| author | Martijn Coenen <maco@google.com> | 2011-10-21 16:33:19 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-10-21 16:33:19 -0700 |
| commit | f5ac78375302001d4d979c37bd032bbf7684fa27 (patch) | |
| tree | e0f214c6a802c8095a3e20e8e97b59c639963a5d /res | |
| parent | 2ab89f6ee6603c210923f4d3c0799de1664dc6f5 (diff) | |
| parent | 94dc4266b48f757d39ed0396bf0af86cea7c206a (diff) | |
| download | packages_apps_nfc-f5ac78375302001d4d979c37bd032bbf7684fa27.zip packages_apps_nfc-f5ac78375302001d4d979c37bd032bbf7684fa27.tar.gz packages_apps_nfc-f5ac78375302001d4d979c37bd032bbf7684fa27.tar.bz2 | |
am 94dc4266: Merge "NFC: Enable guard host timeout." into ics-mr0
* commit '94dc4266b48f757d39ed0396bf0af86cea7c206a':
NFC: Enable guard host timeout.
Diffstat (limited to 'res')
0 files changed, 0 insertions, 0 deletions