am 4e7cacd3: Merge "Maybe fix issue #2568615: System server crashed in...
am 4e7cacd3: Merge "Maybe fix issue #2568615: System server crashed in SyncStorageEngine" into froyo
Merge commit '4e7cacd3' into froyo-plus-aosp
* commit '4e7cacd3':
Maybe fix issue #2568615: System server crashed in SyncStorageEngine