China and India have had a chequered history. But recently there have been attempts to mend the relationship.