commit | 3544e33247fb66de561f8007f553f99c6e087f54 | [log] [tgz] |
---|---|---|
author | Nick Pelly <npelly@google.com> | Mon Nov 21 21:08:24 2011 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 21 21:08:24 2011 -0800 |
tree | bd1b5e7e8778fc1601e29b9c514c2e27f11b350b | |
parent | de8b136d5a1bcb5decf0dd00edcd6c9e70b4f882 [diff] | |
parent | 3d547e0dda7ad58108a219c7ef20bab426d5ea38 [diff] |
am 3d547e0d: am f9c1fcc5: Merge "Replace vendor specific NfcGoogle.apk with generic Nfc.apk" into ics-mr1 * commit '3d547e0dda7ad58108a219c7ef20bab426d5ea38': Replace vendor specific NfcGoogle.apk with generic Nfc.apk