am f2b0fb8c: am 7c3e493d: Merge change 25177 into eclair
am f2b0fb8c: am 7c3e493d: Merge change 25177 into eclair

Merge commit 'f2b0fb8c913cb3504f24e04be2221b81979b0cb3'

* commit 'f2b0fb8c913cb3504f24e04be2221b81979b0cb3':
  Fix for #2092883: Allow manual sync even when background data is disabled

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base