tree e8314afbf7fd32c1560dc1269b469220ee992750
parent 0669577b13302767e90a193c5f48e7faae580654
parent fdb2dca4546742803617c370c2fb823b0ab63a07
author Fred Quintana <fredq@google.com> 1315529583 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1315529583 -0700

Merge "Make the SyncManager have wakelocks per account, not per account type, otherwise the parallel sync behavior of gmail can cause the first account to finish to release the wakelock that is used for the other account, which will result in the device going to sleep before the sync is complete."