| commit | f28e772d7848251136bffaa8d2cef086fb01f24a | [log] [tgz] |
|---|---|---|
| author | Jeff Hamilton <jham@android.com> | Mon Oct 25 15:50:41 2010 -0500 |
| committer | Jason parks <jparks@google.com> | Tue May 24 10:30:13 2011 -0500 |
| tree | a2348f8c85df5e86c3eaa522047761111a3d18cd | |
| parent | 8df39c660513f5f82e7c4725d273a988273516ec [diff] |
Fix bad merge from gingerbread: Show an icon in the status bar when the NfcAdapter is in card emulation mode. Change-Id: I64805f1b5f9d4bd9784791ed3a67d76b9e3788f3
