| commit | 7c324a3f7dde4be26b7a996b485a92ba25de3251 | [log] [tgz] |
|---|---|---|
| author | Jeff Hamilton <jham@android.com> | Wed May 25 16:32:12 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 25 16:32:12 2011 -0700 |
| tree | b20f506c5f7aeb87359346bdabdfdd9c3f0e3b79 | |
| parent | fce12613edc5c0550b73cd9af66fa9651fc0ea1e [diff] | |
| parent | 5e654d02457e0f90f8cdaf07843af1be7328ed7f [diff] |
am 5e654d02: am 14019abb: Merge "Swap Mifare for MIFARE." into honeycomb-mr2 * commit '5e654d02457e0f90f8cdaf07843af1be7328ed7f': Swap Mifare for MIFARE.