Partially defrosted chicken in cold water, then defrosted the rest of the way in the fridge
It should be OK, 

You started it frozen and unless the ambient temperature was very warm, the water would still be cold, so the meat was not in the "danger" zone before putting it back in the fridge where it'll continue defrosting slowly.