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

Merge commit '7c3e493d7b2db7f28d6fdb52d79c4d99ef1502b8' into eclair-plus-aosp

* commit '7c3e493d7b2db7f28d6fdb52d79c4d99ef1502b8':
  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