| commit | 5099f41cd41dfbb0250b9de35e42f66d167474ab | [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 | 2ee963463c3506b8788200904160b078e5e5a51d | |
| parent | 19217ac44f9e1251d830efa76da28e180c05e1fd [diff] | |
| parent | a9a33056739e1d3237e148b7e5d64e938c95739a [diff] |
am 5e654d02: am 14019abb: Merge "Swap Mifare for MIFARE." into honeycomb-mr2 * commit '5e654d02457e0f90f8cdaf07843af1be7328ed7f': Swap Mifare for MIFARE.