| commit | df674e5f0385f09d962a2659032ab1afb592b43b | [log] [tgz] |
|---|---|---|
| author | Jeff Hamilton <jham@android.com> | Mon Sep 12 12:00:40 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 12 12:00:40 2011 -0700 |
| tree | dafb6620fb0fd1971f2e0154fd3249606dff13cc | |
| parent | df34eb0ea8cf035c5ca8e118773a614d92da943b [diff] | |
| parent | bcc8233be93ce2be4e8946ddcd5c33232c9f7a93 [diff] |
am bcc8233b: resolved conflicts for merge of 6900b4e2 to gingerbread-plus-aosp * commit 'bcc8233be93ce2be4e8946ddcd5c33232c9f7a93': Patch to add Secure Download Mechanism in the libnfc