| commit | e4f9791b73aa22b10971dd99cb70e184f24c7318 | [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 | c97b8969e4ef613eb50132c6fb67db73972f0892 | |
| parent | 8397b385ecadef98c2a0d778dea37e2cc0bffd63 [diff] | |
| parent | 5099f41cd41dfbb0250b9de35e42f66d167474ab [diff] |
am 7c324a3f: am 5e654d02: am 14019abb: Merge "Swap Mifare for MIFARE." into honeycomb-mr2 * commit '7c324a3f7dde4be26b7a996b485a92ba25de3251': Swap Mifare for MIFARE.