Merge commit 'b5c2939904d7b374aee5b1f675c560e839a318f1' into eclair-plus-aosp * commit 'b5c2939904d7b374aee5b1f675c560e839a318f1': Add aggregated badge to ContactHeaderWidget
Merge commit 'b5c2939904d7b374aee5b1f675c560e839a318f1' into eclair-plus-aosp * commit 'b5c2939904d7b374aee5b1f675c560e839a318f1': Add aggregated badge to ContactHeaderWidget