summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartijn Coenen <maco@google.com>2011-10-21 16:34:47 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-10-21 16:34:47 -0700
commit49bcf5f81432e7b0ef0f28dbfe0e10319fd6e9da (patch)
tree77c2c2d626ec36d1873be955fbcc161667b16be8
parent5ea62ad25e2050f543d8e2104f5ffc1bb2c1ef28 (diff)
parentff39bc6d4fb3fa08fc55721a8962c713751fca09 (diff)
downloadexternal_libnfc-nxp-49bcf5f81432e7b0ef0f28dbfe0e10319fd6e9da.zip
external_libnfc-nxp-49bcf5f81432e7b0ef0f28dbfe0e10319fd6e9da.tar.gz
external_libnfc-nxp-49bcf5f81432e7b0ef0f28dbfe0e10319fd6e9da.tar.bz2
am ff39bc6d: (-s ours) am 17abc6eb: (-s ours) Merge "Remove NFC I2C workaround for Prime (DO NOT MERGE)." into ics-mr0
* commit 'ff39bc6d4fb3fa08fc55721a8962c713751fca09': Remove NFC I2C workaround for Prime (DO NOT MERGE).
0 files changed, 0 insertions, 0 deletions