tree a2348f8c85df5e86c3eaa522047761111a3d18cd
parent 8df39c660513f5f82e7c4725d273a988273516ec
author Jeff Hamilton <jham@android.com> 1288039841 -0500
committer Jason parks <jparks@google.com> 1306251013 -0500

Fix bad merge from gingerbread:

Show an icon in the status bar when the NfcAdapter is in card emulation mode.

Change-Id: I64805f1b5f9d4bd9784791ed3a67d76b9e3788f3