OSDN Git Service

am 7c324a3f: am 5e654d02: am 14019abb: Merge "Swap Mifare for MIFARE." into honeycomb-mr2
authorJeff Hamilton <jham@android.com>
Tue, 31 May 2011 23:00:46 +0000 (16:00 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 31 May 2011 23:00:46 +0000 (16:00 -0700)
commite4f9791b73aa22b10971dd99cb70e184f24c7318
treec97b8969e4ef613eb50132c6fb67db73972f0892
parent8397b385ecadef98c2a0d778dea37e2cc0bffd63
parent5099f41cd41dfbb0250b9de35e42f66d167474ab
am 7c324a3f: am 5e654d02: am 14019abb: Merge "Swap Mifare for MIFARE." into honeycomb-mr2

* commit '7c324a3f7dde4be26b7a996b485a92ba25de3251':
  Swap Mifare for MIFARE.