Merge commit '8e55eaccffeda078d7389b7fb66b0c6df347bf31' into eclair-plus-aosp * commit '8e55eaccffeda078d7389b7fb66b0c6df347bf31': Changing contact status to Presence-based
Merge commit '8e55eaccffeda078d7389b7fb66b0c6df347bf31' into eclair-plus-aosp * commit '8e55eaccffeda078d7389b7fb66b0c6df347bf31': Changing contact status to Presence-based