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