Merge "Clean up synchronization"

This commit is contained in:
Irfan Sheriff 2011-12-12 15:35:25 -08:00 committed by Android (Google) Code Review
commit 313a4b4d1d

Diff Content Not Available