| commit | 0d389cc6ab6cb7d921926b6c948c88845f3d24cd | [log] [tgz] |
|---|---|---|
| author | Jeff Hamilton <jham@android.com> | Wed May 25 15:38:56 2011 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed May 25 15:38:56 2011 -0700 |
| tree | b2e51ea79ac3fb83fa91c0e9906817eacbd203cb | |
| parent | ddc3f51233848d7047f0dc9cbc395af21f09155a [diff] | |
| parent | 964ce8d835985eae222e089bec7625d911a44a93 [diff] |
Merge "Swap Mifare for MIFARE." into honeycomb-mr2