| commit | ea5d340a7f824f6df91d7cef01636c2817bd23d5 | [log] [tgz] |
|---|---|---|
| author | Nick Pelly <npelly@google.com> | Tue Dec 07 09:40:35 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Dec 07 09:40:35 2010 -0800 |
| tree | bb8819642c406973156976ccde649407927dea05 | |
| parent | c6b9dbfa7ad110b492ba37fc7c66cdc7314193eb [diff] | |
| parent | 1218a4a2c4d1136e9e633acb9fa2559dc6fbba79 [diff] |
am 8c30a47d: am 47e6ccb6: Merge "Corrected MIFARE default key set" into gingerbread * commit '8c30a47d801be50272098e60d0079ae1b4ebd22a': Corrected MIFARE default key set