Merge commit '9cc1817d46d8092865d8f1e7a6391dcae197a26a' into eclair-plus-aosp * commit '9cc1817d46d8092865d8f1e7a6391dcae197a26a': Fixing a concurrency problem by changing the contact aggregation exception API.
Merge commit '9cc1817d46d8092865d8f1e7a6391dcae197a26a' into eclair-plus-aosp * commit '9cc1817d46d8092865d8f1e7a6391dcae197a26a': Fixing a concurrency problem by changing the contact aggregation exception API.