diff options
| author | Jeff Hamilton <jham@android.com> | 2011-09-15 10:35:15 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-09-15 10:35:15 -0700 |
| commit | 2f293c70027e66619bbc6081889029427421b18a (patch) | |
| tree | 610ff3dccba0d220965b8068d53895fa0be92dc7 | |
| parent | 71b688d07db1e7fd32a1e02f29b9779f0d0db377 (diff) | |
| parent | df674e5f0385f09d962a2659032ab1afb592b43b (diff) | |
| download | external_libnfc-nxp-2f293c70027e66619bbc6081889029427421b18a.zip external_libnfc-nxp-2f293c70027e66619bbc6081889029427421b18a.tar.gz external_libnfc-nxp-2f293c70027e66619bbc6081889029427421b18a.tar.bz2 | |
am df674e5f: (-s ours) am bcc8233b: resolved conflicts for merge of 6900b4e2 to gingerbread-plus-aosp
* commit 'df674e5f0385f09d962a2659032ab1afb592b43b':
Patch to add Secure Download Mechanism in the libnfc
0 files changed, 0 insertions, 0 deletions