am e7f47f50: Merge change 24921 into eclair
am e7f47f50: Merge change 24921 into eclair

Merge commit 'e7f47f50ad0a97e32c87104e56f311db910e98f1' into eclair-plus-aosp

* commit 'e7f47f50ad0a97e32c87104e56f311db910e98f1':
  add system properties for experimenting with sync timeouts.

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