am 7c324a3f: am 5e654d02: am 14019abb: Merge "Swap Mifare for MIFARE." into honeycomb-mr2

* commit '7c324a3f7dde4be26b7a996b485a92ba25de3251':
  Swap Mifare for MIFARE.
This commit is contained in:
Jeff Hamilton 2011-05-31 16:00:46 -07:00 committed by Android Git Automerger
commit e4f9791b73

Diff Content Not Available