| commit | 866264fa267ee8e1106ef858ab635445501d5f31 | [log] [tgz] |
|---|---|---|
| author | Nick Pelly <npelly@google.com> | Tue Jan 25 10:22:41 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jan 25 10:22:41 2011 -0800 |
| tree | 0dec0b115e0fa808d8ac0c222badcf8da813fc3a | |
| parent | 138ca4affa9b54c13d29831d0cc9495f1d625b68 [diff] | |
| parent | bdd265ba5fe6b2bf632a7a6eb6df9e187a56126a [diff] |
am bdd265ba: resolved conflicts for merge of 12619677 to honeycomb-plus-aosp * commit 'bdd265ba5fe6b2bf632a7a6eb6df9e187a56126a': Make MifareClassic methods more consistent.