Merge commit '106165b5102be226eb8049d2f7f62d7e26034e8a' into gingerbread-plus-aosp * commit '106165b5102be226eb8049d2f7f62d7e26034e8a': Add a RHS status bar slot for NFC.
Merge commit '106165b5102be226eb8049d2f7f62d7e26034e8a' into gingerbread-plus-aosp * commit '106165b5102be226eb8049d2f7f62d7e26034e8a': Add a RHS status bar slot for NFC.