| commit | 5e654d02457e0f90f8cdaf07843af1be7328ed7f | [log] [tgz] |
|---|---|---|
| author | Jeff Hamilton <jham@android.com> | Wed May 25 15:41:51 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 25 15:41:51 2011 -0700 |
| tree | c49ee91cb51f403b055ca267093f73e8db7677cb | |
| parent | a2a605a958ae8443e54b7a2607bc71501682f9ae [diff] | |
| parent | 14019abb40785064ebef5d14e82586a910d33181 [diff] |
am 14019abb: Merge "Swap Mifare for MIFARE." into honeycomb-mr2 * commit '14019abb40785064ebef5d14e82586a910d33181': Swap Mifare for MIFARE.