| commit | e00ef0087308e9f3522140b81b48f00e7cdc81c1 | [log] [tgz] |
|---|---|---|
| author | Jeff Hamilton <jham@android.com> | Tue May 31 16:00:46 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 31 16:00:46 2011 -0700 |
| tree | 36c68f6da11425223374c8307656c9e610f90379 | |
| parent | 256801780f1def2afe6ea74e45c6b7320e4cae57 [diff] | |
| parent | 7c324a3f7dde4be26b7a996b485a92ba25de3251 [diff] |
am 7c324a3f: am 5e654d02: am 14019abb: Merge "Swap Mifare for MIFARE." into honeycomb-mr2 * commit '7c324a3f7dde4be26b7a996b485a92ba25de3251': Swap Mifare for MIFARE.