return;
            }

<<<<<<< HEAD
            // Find the wakelock for this account and authority and store it in mSyncWakeLock.
            // Be sure to release the previous wakelock so that we don't end up with it being
            // held until it is used again.
            // There are a couple tricky things about this code:
            // - make sure that we acquire the new wakelock before releasing the old one,
            //   otherwise the device might go to sleep as soon as we release it.
            // - since we use non-reference counted wakelocks we have to be sure not to do
            //   the release if the wakelock didn't change. Othewise we would do an
            //   acquire followed by a release on the same lock, resulting in no lock
            //   being held.
            PowerManager.WakeLock oldWakeLock = mSyncWakeLock;
            try {
                mSyncWakeLock = getSyncWakeLock(op.account.type, op.authority);
                mSyncWakeLock.acquire();
            } finally {
                if (oldWakeLock != null && oldWakeLock != mSyncWakeLock) {
                    oldWakeLock.release();
                }
            }

=======
            mSyncWakeLock.setWorkSource(new WorkSource(syncAdapterInfo.uid));
            mSyncWakeLock.acquire();
>>>>>>> 6421ae7eff277da7c0f84eb1cb78c2015ff04b25
            // no need to schedule an alarm, as that will be done by our caller.

            // the next step will occur when we get either a timeout or a

                return;
            }

            // Find the wakelock for this account and authority and store it in mSyncWakeLock.
            // Be sure to release the previous wakelock so that we don't end up with it being
            // held until it is used again.
            // There are a couple tricky things about this code:
            // - make sure that we acquire the new wakelock before releasing the old one,
            //   otherwise the device might go to sleep as soon as we release it.
            // - since we use non-reference counted wakelocks we have to be sure not to do
            //   the release if the wakelock didn't change. Othewise we would do an
            //   acquire followed by a release on the same lock, resulting in no lock
            //   being held.
            PowerManager.WakeLock oldWakeLock = mSyncWakeLock;
            try {
                mSyncWakeLock = getSyncWakeLock(op.account.type, op.authority);
				mSyncWakeLock.setWorkSource(new WorkSource(syncAdapterInfo.uid));
                mSyncWakeLock.acquire();
            } finally {
                if (oldWakeLock != null && oldWakeLock != mSyncWakeLock) {
                    oldWakeLock.release();
                }
            }

            // no need to schedule an alarm, as that will be done by our caller.

            // the next step will occur when we get either a timeout or a