| commit | 54652f0bfb1861c65fec7d73cc68d6c84216333a | [log] [tgz] |
|---|---|---|
| author | Nick Pelly <npelly@google.com> | Mon Nov 21 16:05:29 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 21 16:05:29 2011 -0800 |
| tree | 05635fd83764e5da169ab82638c7c646b9f2dba3 | |
| parent | 35a9270a5ed1d70ece5f8ef17b618cc18590869f [diff] | |
| parent | f9c1fcc505d59fd87392e6af7341b1737f186081 [diff] |
am f9c1fcc5: Merge "Replace vendor specific NfcGoogle.apk with generic Nfc.apk" into ics-mr1 * commit 'f9c1fcc505d59fd87392e6af7341b1737f186081': Replace vendor specific NfcGoogle.apk with generic Nfc.apk