523959f50e
Merge commit 'd1af902c21b4911b964c82ced3d80fcf9ab41540' into gingerbread-plus-aosp * commit 'd1af902c21b4911b964c82ced3d80fcf9ab41540': Deprecate some status bar icons that now come from the phone app (and