am 937d688a: am d052b316: Fix intermittent race condition in SyncCalendarTests

Merge commit '937d688a3f4124ad9f4a7596c378cb35547e475a' into eclair-mr2-plus-aosp

* commit '937d688a3f4124ad9f4a7596c378cb35547e475a':
  Fix intermittent race condition in SyncCalendarTests