| commit | 772130a3db390936a4ad448c56780f167eaa401f | [log] [tgz] |
|---|---|---|
| author | Nick Pelly <npelly@google.com> | Mon Nov 21 21:08:27 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 21 21:08:27 2011 -0800 |
| tree | 0c71de8383a6a6ca07533feb1b9edc4f0524cc0e | |
| parent | ac9b34c8331ad78221172cb36e9e1664a81df5e9 [diff] | |
| parent | e1cadb0cb6d6741a8b0a94456a5324c6f4a6f64d [diff] |
am e1cadb0c: Merge "Replace vendor specific NfcGoogle.apk with generic Nfc.apk" into ics-mr1 * commit 'e1cadb0cb6d6741a8b0a94456a5324c6f4a6f64d': Replace vendor specific NfcGoogle.apk with generic Nfc.apk