| commit | a9a33056739e1d3237e148b7e5d64e938c95739a | [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 | b2e51ea79ac3fb83fa91c0e9906817eacbd203cb | |
| parent | 7f3c73a330f1a760fb285906b2d8215f72624bc5 [diff] | |
| parent | 0d389cc6ab6cb7d921926b6c948c88845f3d24cd [diff] |
am 14019abb: Merge "Swap Mifare for MIFARE." into honeycomb-mr2 * commit '14019abb40785064ebef5d14e82586a910d33181': Swap Mifare for MIFARE.