Merge "support the changes to the SyncAdapter definition that allow specifying allowParallelSyncs and isAlwaysSyncable"