am d052b316: Fix intermittent race condition in SyncCalendarTests

Merge commit 'd052b31665e9b65874edc491ff6ffd4939afe34d' into eclair-plus-aosp

* commit 'd052b31665e9b65874edc491ff6ffd4939afe34d':
  Fix intermittent race condition in SyncCalendarTests