| commit | 14019abb40785064ebef5d14e82586a910d33181 | [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 | 4bb7191fb32f97da1cdecec53df13b615c864054 | |
| parent | c112118a9091aa69ea70fea7c23f1e078ee87908 [diff] | |
| parent | 734e9b0c73483fdaa582c21dedc24107b1fe8838 [diff] |
Merge "Swap Mifare for MIFARE." into honeycomb-mr2