Merge commit 'd35afcda674eaa0222f0adbf8d712bde3a388a39' into eclair-plus-aosp * commit 'd35afcda674eaa0222f0adbf8d712bde3a388a39': border for the non-badge case
Merge commit 'd35afcda674eaa0222f0adbf8d712bde3a388a39' into eclair-plus-aosp * commit 'd35afcda674eaa0222f0adbf8d712bde3a388a39': border for the non-badge case