| commit | f0732fbd4d1937537bf18b37e12de933eb40a562 | [log] [tgz] |
|---|---|---|
| author | Nick Pelly <npelly@google.com> | Mon Jan 10 12:06:39 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jan 10 12:06:39 2011 -0800 |
| tree | bc367a5d181b3d6c09c9acfb932083ae0ab74ad7 | |
| parent | e313fa36aa6ed7ed24dbcf1342e3312c38a7b511 [diff] | |
| parent | e7934257bdc0bc4b4b8e15b746fa072da04f4497 [diff] |
am d64d711d: Merge "Change Tag.getTechnology(NfcAdapter, int) to NfcAdapter.getTechnology(Tag, int)" into gingerbread * commit 'd64d711d457326b503981f7e55ab1448fa23ad9f': Change Tag.getTechnology(NfcAdapter, int) to NfcAdapter.getTechnology(Tag, int)