Commits
Jeff Hamilton authored and Android Git Automerger committed e00ef008730M
am 7c324a3f: am 5e654d02: am 14019abb: Merge "Swap Mifare for MIFARE." into honeycomb-mr2 * commit '7c324a3f7dde4be26b7a996b485a92ba25de3251': Swap Mifare for MIFARE.
Showing diff to256801780f1