tree 5cd123fcb7eddc00e68df70a3296b418d1bb1fb7
parent 2a38657dfcb5655e3e900a3d25695864f3d023a3
parent 097b4ed4100369862793cf4f0fbbb969b50c154e
author Nick Pelly <npelly@google.com> 1321920223 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1321920223 -0800

Merge "Replace vendor specific NfcGoogle.apk with generic Nfc.apk" into ics-mr1